|
@@ -229,7 +229,7 @@ ns_get_environment_variable(const string &var) const {
|
|
|
} else if (var == "MAIN_DIR") {
|
|
} else if (var == "MAIN_DIR") {
|
|
|
#ifdef HAVE_PYTHON
|
|
#ifdef HAVE_PYTHON
|
|
|
// If we're running from Python code, read out sys.argv.
|
|
// If we're running from Python code, read out sys.argv.
|
|
|
- if (Py_IsInitialized()) {
|
|
|
|
|
|
|
+ if (!ns_has_environment_variable("PANDA_INCOMPATIBLE_PYTHON") && Py_IsInitialized()) {
|
|
|
PyObject* obj = PySys_GetObject((char*) "argv");
|
|
PyObject* obj = PySys_GetObject((char*) "argv");
|
|
|
if (obj) {
|
|
if (obj) {
|
|
|
Filename main_dir = Filename::from_os_specific(PyString_AsString(PyList_GetItem(obj, 0)));
|
|
Filename main_dir = Filename::from_os_specific(PyString_AsString(PyList_GetItem(obj, 0)));
|