luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactoring of pya - using external module defintions for pya initialization

This commit is contained in:
Matthias Koefferlein 2023-03-10 21:58:01 +01:00
parent 92204915a4
commit 8b7e2b2b40
1 changed files with 14 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/pya/pya/pya.cc
View File

@ -162,38 +162,6 @@ private:
static const char *pya_module_name = "pya"; static const char *pya_module_name = "pya";
#if PY_MAJOR_VERSION < 3
static PyObject *
init_pya_module ()
{
static PyMethodDef module_methods[] = {
{NULL} // Sentinel
};
return Py_InitModule3 (pya_module_name, module_methods, "KLayout Python API.");
}
#else
static PyObject *
init_pya_module ()
{
static struct PyModuleDef moduledef = {
PyModuleDef_HEAD_INIT,
pya_module_name, // m_name
"KLayout Python API.", // m_doc
-1, // m_size
NULL, // m_methods
NULL, // m_reload
NULL, // m_traverse
NULL, // m_clear
NULL, // m_free
};
return PyModule_Create (&moduledef);
}
#endif
static void reset_interpreter () static void reset_interpreter ()
{ {
delete sp_interpreter; delete sp_interpreter;
@ -328,14 +296,6 @@ PythonInterpreter::PythonInterpreter (bool embedded)
PySys_SetArgv (1, argv); PySys_SetArgv (1, argv);
#endif #endif
PyObject *module = init_pya_module ();
if (module == NULL) {
check_error ();
return;
}
PyImport_ImportModule (pya_module_name);
#else #else
// Python 3 requires a unicode string for the application name // Python 3 requires a unicode string for the application name
@ -346,7 +306,6 @@ PythonInterpreter::PythonInterpreter (bool embedded)
Py_DECREF (an); Py_DECREF (an);
Py_SetProgramName (mp_py3_app_name); Py_SetProgramName (mp_py3_app_name);
PyImport_AppendInittab (pya_module_name, &init_pya_module);
Py_InitializeEx (0 /*don't set signals*/); Py_InitializeEx (0 /*don't set signals*/);
// Set dummy argv[] // Set dummy argv[]
@ -354,35 +313,30 @@ PythonInterpreter::PythonInterpreter (bool embedded)
wchar_t *argv[1] = { mp_py3_app_name }; wchar_t *argv[1] = { mp_py3_app_name };
PySys_SetArgvEx (1, argv, 0); PySys_SetArgvEx (1, argv, 0);
// Import the module
PyObject *module = PyImport_ImportModule (pya_module_name);
if (module == NULL) {
check_error ();
return;
}
#endif #endif
// Build two objects that provide a way to redirect stdout, stderr
// and instantiate them two times for stdout and stderr.
PYAChannelObject::make_class (module);
m_stdout_channel = PythonRef (PYAChannelObject::create (gsi::Console::OS_stdout));
m_stdout = PythonPtr (m_stdout_channel.get ());
m_stderr_channel = PythonRef (PYAChannelObject::create (gsi::Console::OS_stderr));
m_stderr = PythonPtr (m_stderr_channel.get ());
sp_interpreter = this; sp_interpreter = this;
m_pya_module.reset (new pya::PythonModule ());
m_pya_module->init (pya_module_name, module);
m_pya_module->make_classes ();
// Add a reference to the "pymod" directory close to our own library. // Add a reference to the "pymod" directory close to our own library.
// We can put build-in modules there. // We can put build-in modules there.
std::string module_path = tl::get_module_path ((void *) &reset_interpreter); std::string module_path = tl::get_module_path ((void *) &reset_interpreter);
if (! module_path.empty ()) { if (! module_path.empty ()) {
add_path (tl::combine_path (tl::absolute_path (module_path), "pymod")); add_path (tl::combine_path (tl::absolute_path (module_path), "pymod"));
} }
PyObject *pya_module = PyImport_ImportModule (pya_module_name);
if (pya_module == NULL) {
check_error ();
return;
}
// Build two objects that provide a way to redirect stdout, stderr
// and instantiate them two times for stdout and stderr.
PYAChannelObject::make_class (pya_module);
m_stdout_channel = PythonRef (PYAChannelObject::create (gsi::Console::OS_stdout));
m_stdout = PythonPtr (m_stdout_channel.get ());
m_stderr_channel = PythonRef (PYAChannelObject::create (gsi::Console::OS_stderr));
m_stderr = PythonPtr (m_stderr_channel.get ());
} }
PythonInterpreter::~PythonInterpreter () PythonInterpreter::~PythonInterpreter ()