X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FContainer%2FContainer_init_python.cxx;h=26a40b4550cea08b4810c91bb9d237d28202277b;hb=3ce0546302001755828c8476425a60c6ab61ac92;hp=e4963c0a2ae8b3a2e35ad9d75c381fc27eaa3983;hpb=df2f3847c7cecf6d51055cb5872105121a15bcb2;p=modules%2Fkernel.git diff --git a/src/Container/Container_init_python.cxx b/src/Container/Container_init_python.cxx index e4963c0a2..26a40b455 100644 --- a/src/Container/Container_init_python.cxx +++ b/src/Container/Container_init_python.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2024 CEA, EDF, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -20,7 +20,8 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#include +#include +#include #ifndef WIN32 #include #endif @@ -30,33 +31,132 @@ #include "Container_init_python.hxx" #if PY_VERSION_HEX < 0x03050000 +static char* +Py_EncodeLocale(const wchar_t *arg, size_t *size) +{ + return _Py_wchar2char(arg, size); +} static wchar_t* Py_DecodeLocale(const char *arg, size_t *size) { - wchar_t *res; - unsigned char *in; - wchar_t *out; - size_t argsize = strlen(arg) + 1; + return _Py_char2wchar(arg, size); +} +#endif - if (argsize > PY_SSIZE_T_MAX/sizeof(wchar_t)) - return NULL; - res = (wchar_t*) PyMem_RawMalloc(argsize*sizeof(wchar_t)); - if (!res) - return NULL; +/* + The following functions are used to hook the Python + interpreter output. +*/ - in = (unsigned char*)arg; - out = res; - while(*in) - if(*in < 128) - *out++ = *in++; - else - *out++ = 0xdc00 + *in++; - *out = 0; - if (size != NULL) - *size = out - res; - return res; +static void ContainerPyStdOut_dealloc(ContainerPyStdOut *self) +{ + PyObject_Del(self); +} + +static PyObject* +ContainerPyStdOut_write(ContainerPyStdOut *self, PyObject *args) +{ + char *c; + if (!PyArg_ParseTuple(args, "s",&c)) + return NULL; + if(self->_cb==NULL) { + if ( self->_iscerr ) + std::cerr << c ; + else + std::cout << c ; + } + else { + self->_cb(self->_data,c); + } + Py_INCREF(Py_None); + return Py_None; +} + +static PyObject* +ContainerPyStdOut_flush(ContainerPyStdOut */*self*/, PyObject */*args*/) +{ + Py_INCREF(Py_None); + return Py_None; +} + +static PyMethodDef ContainerPyStdOut_methods[] = { + {"write", (PyCFunction)ContainerPyStdOut_write, METH_VARARGS, PyDoc_STR("write(string) -> None")}, + {"flush", (PyCFunction)ContainerPyStdOut_flush, METH_NOARGS, PyDoc_STR("flush() -> None")}, + {0, 0, 0, 0} /* sentinel */ +}; + +static PyMemberDef ContainerPyStdOut_memberlist[] = { + {(char*)"softspace", T_INT, offsetof(ContainerPyStdOut, softspace), 0, (char*)"flag indicating that a space needs to be printed; used by print"}, + {0, 0, 0, 0, 0} /* sentinel */ +}; + +static PyTypeObject ContainerPyStdOut_Type = { + /* The ob_type field must be initialized in the module init function + * to be portable to Windows without using C++. */ + PyVarObject_HEAD_INIT(NULL, 0) + /*0,*/ /*ob_size*/ + "PyOut", /*tp_name*/ + sizeof(ContainerPyStdOut), /*tp_basicsize*/ + 0, /*tp_itemsize*/ + /* methods */ + (destructor)ContainerPyStdOut_dealloc, /*tp_dealloc*/ + 0, /*tp_print*/ + 0, /*tp_getattr*/ + 0, /*tp_setattr*/ + 0, /*tp_compare*/ + 0, /*tp_repr*/ + 0, /*tp_as_number*/ + 0, /*tp_as_sequence*/ + 0, /*tp_as_mapping*/ + 0, /*tp_hash*/ + 0, /*tp_call*/ + 0, /*tp_str*/ + PyObject_GenericGetAttr, /*tp_getattro*/ + /* softspace is writable: we must supply tp_setattro */ + PyObject_GenericSetAttr, /* tp_setattro */ + 0, /*tp_as_buffer*/ + Py_TPFLAGS_DEFAULT, /*tp_flags*/ + 0, /*tp_doc*/ + 0, /*tp_traverse*/ + 0, /*tp_clear*/ + 0, /*tp_richcompare*/ + 0, /*tp_weaklistoffset*/ + 0, /*tp_iter*/ + 0, /*tp_iternext*/ + ContainerPyStdOut_methods, /*tp_methods*/ + ContainerPyStdOut_memberlist, /*tp_members*/ + 0, /*tp_getset*/ + 0, /*tp_base*/ + 0, /*tp_dict*/ + 0, /*tp_descr_get*/ + 0, /*tp_descr_set*/ + 0, /*tp_dictoffset*/ + 0, /*tp_init*/ + 0, /*tp_alloc*/ + 0, /*tp_new*/ + 0, /*tp_free*/ + 0, /*tp_is_gc*/ + 0, /*tp_bases*/ + 0, /*tp_mro*/ + 0, /*tp_cache*/ + 0, /*tp_subclasses*/ + 0, /*tp_weaklist*/ + 0, /*tp_del*/ + 0, /*tp_version_tag*/ + 0, /*tp_finalize*/ +}; + +static ContainerPyStdOut* ContainerNewPyStdOut( bool iscerr ) +{ + ContainerPyStdOut *self; + self = PyObject_New(ContainerPyStdOut, &ContainerPyStdOut_Type); + if (self == NULL) + return NULL; + self->softspace = 0; + self->_cb = NULL; + self->_iscerr = iscerr; + return self; } -#endif void KERNEL_PYTHON::init_python(int argc, char **argv) { @@ -65,12 +165,8 @@ void KERNEL_PYTHON::init_python(int argc, char **argv) MESSAGE("Python already initialized"); return; } - MESSAGE("================================================================="); - MESSAGE("Python Initialization..."); - MESSAGE("================================================================="); // set stdout to line buffering (aka C++ std::cout) setvbuf(stdout, (char *)NULL, _IOLBF, BUFSIZ); - wchar_t* salome_python; char* env_python=getenv("SALOME_PYTHON"); if(env_python != 0) { @@ -80,7 +176,7 @@ void KERNEL_PYTHON::init_python(int argc, char **argv) Py_Initialize(); // Initialize the interpreter if (Py_IsInitialized()) { - MESSAGE("Python initialized eh eh eh"); + MESSAGE("Python initialized"); } wchar_t **changed_argv = new wchar_t*[argc]; // Setting arguments for (int i = 0; i < argc; i++) @@ -101,11 +197,18 @@ void KERNEL_PYTHON::init_python(int argc, char **argv) script += "import sys\n"; script += "sys.excepthook = _custom_except_hook\n"; script += "del _custom_except_hook, sys\n"; - int res = PyRun_SimpleString(script.c_str()); + PyRun_SimpleString(script.c_str()); // VSR (22/09/2016): end of workaround +#if PY_VERSION_HEX < 0x03070000 PyEval_InitThreads(); // Create (and acquire) the interpreter lock +#endif + // Create python objects to capture stdout and stderr + PyObject* _vout=(PyObject*)ContainerNewPyStdOut( false ); // stdout + PyObject* _verr=(PyObject*)ContainerNewPyStdOut( true ); // stderr + PySys_SetObject((char*)"stderr",_verr); + PySys_SetObject((char*)"stdout",_vout); + PyThreadState *pts = PyGILState_GetThisThreadState(); PyEval_ReleaseThread(pts); //delete[] changed_argv; } -