TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 00:06:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

panda: Remove PyEval_InitThreads calls when compiling against Python 3.9+

Browse Source 
Cherry-pick from #1053
This commit is contained in:
Daniel 2020-11-19 23:27:46 +02:00 committed by rdb
parent bf59e880c6
commit 4f63ef635d
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/event/pythonTask.cxx
View File

@ -72,12 +72,12 @@ PythonTask(PyObject *func_or_coro, const std::string &name) :
__dict__ = PyDict_New(); __dict__ = PyDict_New();
#ifndef SIMPLE_THREADS #if !defined(SIMPLE_THREADS) && defined(WITH_THREAD) && PY_VERSION_HEX < 0x03090000
// Ensure that the Python threading system is initialized and ready to go. // Ensure that the Python threading system is initialized and ready to go.
#ifdef WITH_THREAD // This symbol defined within Python.h // WITH_THREAD symbol defined within Python.h
// PyEval_InitThreads is now a deprecated no-op in Python 3.9+
PyEval_InitThreads(); PyEval_InitThreads();
#endif #endif
#endif
} }
/** /**

6
panda/src/pipeline/pythonThread.cxx
View File

@ -38,12 +38,12 @@ PythonThread(PyObject *function, PyObject *args,
set_args(args); set_args(args);
#ifndef SIMPLE_THREADS #if !defined(SIMPLE_THREADS) && defined(WITH_THREAD) && PY_VERSION_HEX < 0x03090000
// Ensure that the Python threading system is initialized and ready to go. // Ensure that the Python threading system is initialized and ready to go.
#ifdef WITH_THREAD // This symbol defined within Python.h // WITH_THREAD symbol defined within Python.h
// PyEval_InitThreads is now a deprecated no-op in Python 3.9+
PyEval_InitThreads(); PyEval_InitThreads();
#endif #endif
#endif
} }
/** /**

9
panda/src/putil/pythonCallbackObject.cxx
View File

@ -41,17 +41,18 @@ PythonCallbackObject(PyObject *function) {
set_function(function); set_function(function);
#ifndef SIMPLE_THREADS #if !defined(SIMPLE_THREADS) && defined(WITH_THREAD)
// Ensure that the Python threading system is initialized and ready to go. // Ensure that the Python threading system is initialized and ready to go.
#ifdef WITH_THREAD // This symbol defined within Python.h
#if PY_VERSION_HEX >= 0x03020000 #if PY_VERSION_HEX >= 0x03020000
Py_Initialize(); Py_Initialize();
#endif #endif
#if PY_VERSION_HEX < 0x03090000
// PyEval_InitThreads is now a deprecated no-op in Python 3.9+
PyEval_InitThreads(); PyEval_InitThreads();
#endif #endif // PY_VERSION_HEX
#endif #endif // WITH_THREAD
} }
/** /**