IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge Richard Cohen's 'fix-python-311-build' of github.com:richardcohen/gnucash into stable

Browse Source
This commit is contained in:
John Ralls 2023-03-30 18:22:09 -07:00
commit d7d9240e3d
1 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gnucash/python/gncmod-python.c
View File

@ -57,44 +57,23 @@ libgncmod_python_gnc_module_description(void)
return g_strdup("An embedded Python interpreter");
}
//extern PyObject* PyInit__sw_app_utils(void);
//extern PyObject* PyInit__sw_core_utils(void);
#if PY_VERSION_HEX >= 0x030b0000
// PySys_SetArgv is deprecated in 3.11
#pragma GCC diagnostic warning "-Wdeprecated-declarations"
#endif
int
libgncmod_python_gnc_module_init(int refcount)
{
/* There isn't yet a python module to init.
PyObject *pName, *pModule;
*/
FILE *fp;
gchar *pkgdatadir, *init_filename;
wchar_t* argv = NULL;
Py_Initialize();
wchar_t* argv = NULL;
PySys_SetArgv(0, &argv);
// I don't quite understand why these are loaded here
// - these are python modules so should be able to just import them
// in init.py
//PyInit__sw_app_utils();
//PyInit__sw_core_utils();
/* There isn't yet a python module to init.
pName = PyString_FromString("path/to/init.py");
pModule = PyImport_Import(pName);
if (!pModule) {
PyErr_Print();
return FALSE;
}
Py_DECREF(pName);
Py_DECREF(pModule);
*/
pkgdatadir = gnc_path_get_pkgdatadir();
init_filename = g_build_filename(pkgdatadir, "python/init.py", (char*)NULL);
g_debug("Looking for python init script at %s", (init_filename ? init_filename : "<null>"));
fp = fopen(init_filename, "r");
gchar *pkgdatadir = gnc_path_get_pkgdatadir();
gchar *init_filename = g_build_filename(pkgdatadir, "python/init.py", (char*)NULL);
g_debug("Looking for python init script at %s", init_filename);
FILE *fp = fopen(init_filename, "r");
if (fp)
{
PyRun_SimpleFile(fp, init_filename);