Skip to content
Snippets Groups Projects
Commit ef8fda13 authored by David Gobbi's avatar David Gobbi Committed by Kitware Robot
Browse files

Merge topic 'python313-fixes-2'


65470923 Add 'encoding' to vtkPythonInterpreter IO streams

Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Tested-by: default avatarbuildbot <buildbot@kitware.com>
Reviewed-by: default avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !11494
parents 20fed67d 65470923
No related branches found
No related tags found
No related merge requests found
......@@ -16,7 +16,8 @@ VTK_ABI_NAMESPACE_BEGIN
struct vtkPythonStdStreamCaptureHelper
{
PyObject_HEAD
int softspace; // Used by print to keep track of its state.
int softspace; // Used by print to keep track of its state.
const char* Encoding; // Encoding, set to "utf-8"
bool DumpToError;
void Write(const char* string)
......@@ -84,6 +85,9 @@ static PyMemberDef vtkPythonStdStreamCaptureHelperMembers[] = {
{ VTK_PYTHON_MEMBER_DEF_STR("softspace"), T_INT,
offsetof(vtkPythonStdStreamCaptureHelper, softspace), 0,
VTK_PYTHON_MEMBER_DEF_STR("Placeholder so print can keep state.") },
{ VTK_PYTHON_MEMBER_DEF_STR("encoding"), T_STRING,
offsetof(vtkPythonStdStreamCaptureHelper, Encoding), READONLY,
VTK_PYTHON_MEMBER_DEF_STR("Text encoding for file.") },
{ nullptr, 0, 0, 0, nullptr }
};
......@@ -250,6 +254,7 @@ static vtkPythonStdStreamCaptureHelper* NewPythonStdStreamCaptureHelper(bool for
PyObject_New(vtkPythonStdStreamCaptureHelper, &vtkPythonStdStreamCaptureHelperType);
if (wrapper)
{
wrapper->Encoding = "utf-8";
wrapper->DumpToError = for_stderr;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment