Differential D12838 Diff 34032 plugins/extensions/pykrita/plugin/utilities.cpp

Changeset View

Standalone View

View Options

plugins/extensions/pykrita/plugin/utilities.cpp

Context not available.
76 return initStatus; 76​ return initStatus;
77 } 77​ }
78 78​
79​#if defined(IS_PY3K)
79 if (0 != PyImport_AppendInittab(Python::PYKRITA_ENGINE, PyInit_pykrita)) { 80​ if (0 != PyImport_AppendInittab(Python::PYKRITA_ENGINE, PyInit_pykrita)) {
81​#else
82​ if (0 != PyImport_AppendInittab(Python::PYKRITA_ENGINE, initpykrita)) {
83​#endif
80 initStatus = INIT_CANNOT_LOAD_PYKRITA_MODULE; 84​ initStatus = INIT_CANNOT_LOAD_PYKRITA_MODULE;
81 return initStatus; 85​ return initStatus;
82 } 86​ }
Context not available.
101 105​
102 pluginManagerInstance.reset(new PythonPluginManager()); 106​ pluginManagerInstance.reset(new PythonPluginManager());
103 107​
108​#if defined(IS_PY3K)
104 // Initialize our built-in module. 109​ // Initialize our built-in module.
105 auto pykritaModule = PyInit_pykrita(); 110​ auto pykritaModule = PyInit_pykrita();
106 111​
Context not available.
109 return initStatus; 114​ return initStatus;
110 //return i18nc("@info:tooltip ", "No <icode>pykrita</icode> built-in module"); 115​ //return i18nc("@info:tooltip ", "No <icode>pykrita</icode> built-in module");
111 } 116​ }
117​#else
118​ initpykrita();
119​#endif
112 120​
113 initStatus = INIT_OK; 121​ initStatus = INIT_OK;
114 return initStatus; 122​ return initStatus;
Context not available.
407#ifdef Q_OS_WIN 415​#ifdef Q_OS_WIN
408 QVector<wchar_t> joinedPathsWChars(joinedPaths.size() + 1, 0); 416​ QVector<wchar_t> joinedPathsWChars(joinedPaths.size() + 1, 0);
409 joinedPaths.toWCharArray(joinedPathsWChars.data()); 417​ joinedPaths.toWCharArray(joinedPathsWChars.data());
410 Py_SetPath(joinedPathsWChars.data()); 418​ PyRun_SimpleString("import sys; import os");
alvinhochunUnsubmitted
Not Done

Please don't change this part... I'm 90% sure this will break something with the Windows build. The path passed to Py_SetPath is specifically crafted to handle the embedded Python used with the Windows build.

alvinhochun: Please don't change this part... I'm 90% sure this will break something with the Windows build.
419​ QString pathCommand = QString("sys.path += '") + joinedPaths + QString("'.split(os.pathsep)");
420​ PyRun_SimpleString(pathCommand.toUtf8().constData());
411#else 421​#else
412 if (KoResourcePaths::getApplicationRoot().contains(".mount_Krita")) { 422​ if (KoResourcePaths::getApplicationRoot().contains(".mount_Krita")) {
413 QVector<wchar_t> joinedPathsWChars(joinedPaths.size() + 1, 0); 423​ QVector<wchar_t> joinedPathsWChars(joinedPaths.size() + 1, 0);
414 joinedPaths.toWCharArray(joinedPathsWChars.data()); 424​ joinedPaths.toWCharArray(joinedPathsWChars.data());
415 Py_SetPath(joinedPathsWChars.data()); 425​ PyRun_SimpleString("import sys; import os");
426​ QString pathCommand = QString("sys.path += '") + joinedPaths + QString("'.split(os.pathsep)");
427​ PyRun_SimpleString(pathCommand.toUtf8().constData());
416 } 428​ }
417 else { 429​ else {
418 qputenv("PYTHONPATH", joinedPaths.toLocal8Bit()); 430​ qputenv("PYTHONPATH", joinedPaths.toLocal8Bit());
Context not available.