panda3d-interrogate 0.1.1__tar.gz → 0.3.0__tar.gz

{panda3d_interrogate-0.1.1 → panda3d_interrogate-0.3.0}/.github/workflows/release.yml

@@ -29,7 +29,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install build cibuildwheel==2.20.0
+        pip install build cibuildwheel==2.21.3
 
     - name: Build wheels
       run: python -m cibuildwheel

{panda3d_interrogate-0.1.1 → panda3d_interrogate-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: panda3d-interrogate
-Version: 0.1.1
+Version: 0.3.0
 Summary: Binding generator designed for Panda3D
 License: Copyright (c) 2008, Carnegie Mellon University.
         All rights reserved.

{panda3d_interrogate-0.1.1 → panda3d_interrogate-0.3.0}/cmake/macros/Python.cmake

@@ -60,7 +60,7 @@ function(add_python_target target)
     add_library(${target} ${MODULE_TYPE} ${sources})
     target_link_libraries(${target} PKG::PYTHON)
   else()
-    if(MODULE_TYPE STREQUAL "MODULE")
+    if(MODULE_TYPE STREQUAL "MODULE" AND NOT PYTHON_FREETHREADED)
       Python_add_library(${target} MODULE USE_SABI 3.3 ${sources})
     else()
       Python_add_library(${target} ${MODULE_TYPE} ${sources})
@@ -85,6 +85,7 @@ function(add_python_target target)
 
     if(PYTHON_ARCH_INSTALL_DIR)
       install(TARGETS ${target} EXPORT "${export}" COMPONENT "${component}" DESTINATION "${PYTHON_ARCH_INSTALL_DIR}${slash_namespace}")
+      install(FILES "${basename}.pyi" OPTIONAL COMPONENT "${component}" DESTINATION "${PYTHON_ARCH_INSTALL_DIR}${slash_namespace}")
     endif()
 
   else()

{panda3d_interrogate-0.1.1 → panda3d_interrogate-0.3.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "panda3d-interrogate"
-version = "0.1.1"
+version = "0.3.0"
 description = "Binding generator designed for Panda3D"
 readme = "README.md"
 requires-python = ">=3.2"
@@ -39,26 +39,26 @@ interrogate = "python/interrogate"
 interrogate_module = "python/interrogate_module"
 
 [tool.cibuildwheel]
-build = "cp38-*"
+build = "cp38-* cp313t-*"
+free-threaded-support = true
 
 [tool.cibuildwheel.linux]
 repair-wheel-command = [
   "auditwheel repair -w {dest_dir} {wheel}",
-  "pip install -U abi3audit",
-  "abi3audit --strict --report {wheel}",
 ]
 
 [tool.cibuildwheel.macos]
 archs = ["universal2"]
 repair-wheel-command = [
   "cp {wheel} {dest_dir}",
-  "pip install -U abi3audit",
-  "abi3audit --strict --report {wheel}",
 ]
 
 [tool.cibuildwheel.windows]
 repair-wheel-command = [
   "copy {wheel} {dest_dir}",
-  "pip install -U abi3audit",
-  "pipx run abi3audit --strict --report {wheel}",
 ]
+
+[[tool.cibuildwheel.overrides]]
+select = "cp38-*"
+inherit.repair-wheel-command = "append"
+repair-wheel-command = "pipx run abi3audit --strict --report {wheel}"

{panda3d_interrogate-0.1.1 → panda3d_interrogate-0.3.0}/src/Config.cmake

@@ -83,6 +83,15 @@ if(Python_FOUND)
   set(PYTHON_INCLUDE_DIRS ${Python_INCLUDE_DIRS})
   set(PYTHON_LIBRARY_DIRS ${Python_LIBRARY_DIRS})
   set(PYTHON_VERSION_STRING ${Python_VERSION})
+
+  execute_process(COMMAND ${Python_EXECUTABLE}
+    -c "import sysconfig;print(sysconfig.get_config_var('Py_GIL_DISABLED') or 0)"
+    OUTPUT_VARIABLE PYTHON_FREETHREADED
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+  if(PYTHON_FREETHREADED)
+    # The free-threaded build has no stable ABI (yet).
+    set(_IMPORTED_AS Python::Module)
+  endif()
 endif()
 
 if(CMAKE_VERSION VERSION_LESS "3.15")
@@ -162,7 +171,15 @@ if(HAVE_PYTHON)
 
   endif()
 
-  if(CYGWIN)
+  if(PYTHON_FREETHREADED)
+    if(CYGWIN)
+      set(_EXT_SUFFIX ".${Python_SOABI}.dll")
+    elseif(WIN32)
+      set(_EXT_SUFFIX ".${Python_SOABI}.pyd")
+    else()
+      set(_EXT_SUFFIX ".${Python_SOABI}.so")
+    endif()
+  elseif(CYGWIN)
     set(_EXT_SUFFIX ".dll")
   elseif(WIN32)
     set(_EXT_SUFFIX ".pyd")

{panda3d_interrogate-0.1.1 → panda3d_interrogate-0.3.0}/src/interrogate/interfaceMakerPythonSimple.cxx

@@ -48,10 +48,13 @@ InterfaceMakerPythonSimple::
  */
 void InterfaceMakerPythonSimple::
 write_includes(std::ostream &out) {
-  out << "#if PY_VERSION_HEX >= 0x30300000\n";
+  out << "#if PY_VERSION_HEX >= 0x30300000 && !defined(Py_GIL_DISABLED)\n";
   out << "#define Py_LIMITED_API 0x30300000\n";
   out << "#endif\n\n";
   InterfaceMakerPython::write_includes(out);
+  out << "\n#ifdef Py_GIL_DISABLED\n";
+  out << "static PyMutex mutex;\n";
+  out << "#endif\n\n";
 }
 
 /**
@@ -132,7 +135,11 @@ write_module(ostream &out,ostream *out_h, InterrogateModuleDef *def) {
 
       << "INIT_FUNC() {\n"
       << "#if PY_MAJOR_VERSION >= 3\n"
-      << "  return PyModule_Create(&python_simple_module);\n"
+      << "  PyObject *module = PyModule_Create(&python_simple_module);\n"
+      << "#ifdef Py_GIL_DISABLED\n"
+      << "  PyUnstable_Module_SetGIL(module, Py_MOD_GIL_NOT_USED);\n"
+      << "#endif\n"
+      << "  return module;\n"
       << "#else\n"
       << "  Py_InitModule(\"" << def->library_name << "\", python_simple_funcs);\n"
       << "#endif\n"
@@ -380,6 +387,9 @@ void InterfaceMakerPythonSimple::write_function_instance(ostream &out, Interface
         << "    }\n";
   }
 
+  out << "#ifdef Py_GIL_DISABLED\n";
+  out << "    PyMutex_Lock(&mutex);\n";
+  out << "#endif\n";
   if (track_interpreter) {
     out << "    in_interpreter = 0;\n";
   }
@@ -397,6 +407,9 @@ void InterfaceMakerPythonSimple::write_function_instance(ostream &out, Interface
     if (track_interpreter) {
       out << "    in_interpreter = 1;\n";
     }
+    out << "#ifdef Py_GIL_DISABLED\n";
+    out << "    PyMutex_Unlock(&mutex);\n";
+    out << "#endif\n";
     if (!extra_cleanup.empty()) {
       out << "   " << extra_cleanup << "\n";
     }
@@ -411,6 +424,9 @@ void InterfaceMakerPythonSimple::write_function_instance(ostream &out, Interface
       if (track_interpreter) {
         out << "    in_interpreter = 1;\n";
       }
+      out << "#ifdef Py_GIL_DISABLED\n";
+      out << "    PyMutex_Unlock(&mutex);\n";
+      out << "#endif\n";
       if (!extra_cleanup.empty()) {
         out << "   " << extra_cleanup << "\n";
       }
@@ -425,6 +441,9 @@ void InterfaceMakerPythonSimple::write_function_instance(ostream &out, Interface
       if (track_interpreter) {
         out << "    in_interpreter = 1;\n";
       }
+      out << "#ifdef Py_GIL_DISABLED\n";
+      out << "    PyMutex_Unlock(&mutex);\n";
+      out << "#endif\n";
       if (!extra_cleanup.empty()) {
         out << "   " << extra_cleanup << "\n";
       }

{panda3d_interrogate-0.1.1 → panda3d_interrogate-0.3.0}/src/interrogatedb/dtool_super_base.cxx

@@ -61,8 +61,18 @@ static void Dtool_FreeInstance_DTOOL_SUPER_BASE(PyObject *self) {
  */
 Dtool_PyTypedObject *Dtool_GetSuperBase() {
   Dtool_TypeMap *type_map = Dtool_GetGlobalTypeMap();
+
+  // If we don't have the GIL, we have to protect this with a lock to make
+  // sure that there is only one DTOOL_SUPER_BASE instance in the world.
+#ifdef Py_GIL_DISABLED
+  PyMutex_Lock(&type_map->_lock);
+#endif
+
   auto it = type_map->find("DTOOL_SUPER_BASE");
   if (it != type_map->end()) {
+#ifdef Py_GIL_DISABLED
+    PyMutex_Unlock(&type_map->_lock);
+#endif
     return it->second;
   }
 
@@ -148,6 +158,9 @@ Dtool_PyTypedObject *Dtool_GetSuperBase() {
 
   if (PyType_Ready((PyTypeObject *)&super_base_type) < 0) {
     PyErr_SetString(PyExc_TypeError, "PyType_Ready(Dtool_DTOOL_SUPER_BASE)");
+#ifdef Py_GIL_DISABLED
+    PyMutex_Unlock(&type_map->_lock);
+#endif
     return nullptr;
   }
   Py_INCREF(&super_base_type._PyType);
@@ -155,6 +168,9 @@ Dtool_PyTypedObject *Dtool_GetSuperBase() {
   PyDict_SetItemString(super_base_type._PyType.tp_dict, "DtoolGetSuperBase", PyCFunction_New(&methods[0], (PyObject *)&super_base_type));
 
   (*type_map)["DTOOL_SUPER_BASE"] = &super_base_type;
+#ifdef Py_GIL_DISABLED
+  PyMutex_Unlock(&type_map->_lock);
+#endif
   return &super_base_type;
 }
 

panda3d_interrogate-0.3.0/src/interrogatedb/interrogatedb.pyi

@@ -0,0 +1,180 @@
+def interrogate_request_database(database_filename: str) -> None: ...
+def interrogate_request_module(def_: int) -> None: ...
+def interrogate_add_search_directory(dirname: str) -> None: ...
+def interrogate_add_search_path(pathstring: str) -> None: ...
+def interrogate_error_flag() -> bool: ...
+
+# Manifest Symbols
+def interrogate_number_of_manifests() -> int: ...
+def interrogate_get_manifest(n: int) -> int: ...
+def interrogate_get_manifest_by_name(manifest_name: str) -> int: ...
+def interrogate_manifest_name(manifest: int) -> str: ...
+def interrogate_manifest_definition(manifest: int) -> str: ...
+def interrogate_manifest_has_type(manifest: int) -> bool: ...
+def interrogate_manifest_get_type(manifest: int) -> int: ...
+def interrogate_manifest_has_getter(manifest: int) -> bool: ...
+def interrogate_manifest_getter(manifest: int) -> int: ...
+def interrogate_manifest_has_int_value(manifest: int) -> bool: ...
+def interrogate_manifest_get_int_value(manifest: int) -> int: ...
+
+# Data Elements
+def interrogate_element_name(element: int) -> str: ...
+def interrogate_element_scoped_name(element: int) -> str: ...
+def interrogate_element_has_comment(element: int) -> bool: ...
+def interrogate_element_comment(element: int) -> str: ...
+def interrogate_get_element_by_name(element_name: str) -> int: ...
+def interrogate_get_element_by_scoped_name(element_name: str) -> int: ...
+def interrogate_element_type(element: int) -> int: ...
+def interrogate_element_has_getter(element: int) -> bool: ...
+def interrogate_element_getter(element: int) -> int: ...
+def interrogate_element_has_setter(element: int) -> bool: ...
+def interrogate_element_setter(element: int) -> int: ...
+def interrogate_element_has_has_function(element: int) -> bool: ...
+def interrogate_element_has_function(element: int) -> int: ...
+def interrogate_element_has_clear_function(element: int) -> bool: ...
+def interrogate_element_clear_function(element: int) -> int: ...
+def interrogate_element_has_del_function(element: int) -> bool: ...
+def interrogate_element_del_function(element: int) -> int: ...
+def interrogate_element_has_insert_function(element: int) -> bool: ...
+def interrogate_element_insert_function(element: int) -> int: ...
+def interrogate_element_has_getkey_function(element: int) -> bool: ...
+def interrogate_element_getkey_function(element: int) -> int: ...
+def interrogate_element_length_function(element: int) -> int: ...
+def interrogate_element_is_sequence(element: int) -> bool: ...
+def interrogate_element_is_mapping(element: int) -> bool: ...
+
+# Global Data
+def interrogate_number_of_globals() -> int: ...
+def interrogate_get_global(n: int) -> int: ...
+
+# Functions
+def interrogate_number_of_global_functions() -> int: ...
+def interrogate_get_global_function(n: int) -> int: ...
+def interrogate_number_of_functions() -> int: ...
+def interrogate_get_function(n: int) -> int: ...
+def interrogate_function_name(function: int) -> str: ...
+def interrogate_function_scoped_name(function: int) -> str: ...
+def interrogate_function_has_comment(function: int) -> bool: ...
+def interrogate_function_comment(function: int) -> str: ...
+def interrogate_function_prototype(function: int) -> str: ...
+def interrogate_function_is_method(function: int) -> bool: ...
+def interrogate_function_class(function: int) -> int: ...
+def interrogate_function_is_unary_op(function: int) -> bool: ...
+def interrogate_function_is_operator_typecast(function: int) -> bool: ...
+def interrogate_function_is_constructor(function: int) -> bool: ...
+def interrogate_function_is_destructor(function: int) -> bool: ...
+def interrogate_function_has_module_name(function: int) -> bool: ...
+def interrogate_function_module_name(function: int) -> str: ...
+def interrogate_function_has_library_name(function: int) -> bool: ...
+def interrogate_function_library_name(function: int) -> str: ...
+def interrogate_function_is_virtual(function: int) -> bool: ...
+def interrogate_function_number_of_c_wrappers(function: int) -> int: ...
+def interrogate_function_c_wrapper(function: int, n: int) -> int: ...
+def interrogate_function_number_of_python_wrappers(function: int) -> int: ...
+def interrogate_function_python_wrapper(function: int, n: int) -> int: ...
+
+# Function Wrappers
+def interrogate_wrapper_name(wrapper: int) -> str: ...
+def interrogate_wrapper_function(wrapper: int) -> int: ...
+def interrogate_wrapper_is_callable_by_name(wrapper: int) -> bool: ...
+def interrogate_wrapper_is_copy_constructor(wrapper: int) -> bool: ...
+def interrogate_wrapper_is_coerce_constructor(wrapper: int) -> bool: ...
+def interrogate_wrapper_is_extension(wrapper: int) -> bool: ...
+def interrogate_wrapper_is_deprecated(wrapper: int) -> bool: ...
+def interrogate_wrapper_has_comment(wrapper: int) -> bool: ...
+def interrogate_wrapper_comment(wrapper: int) -> str: ...
+def interrogate_wrapper_has_return_value(wrapper: int) -> bool: ...
+def interrogate_wrapper_return_type(wrapper: int) -> int: ...
+def interrogate_wrapper_caller_manages_return_value(wrapper: int) -> bool: ...
+def interrogate_wrapper_return_value_destructor(wrapper: int) -> int: ...
+def interrogate_wrapper_number_of_parameters(wrapper: int) -> int: ...
+def interrogate_wrapper_parameter_type(wrapper: int, n: int) -> int: ...
+def interrogate_wrapper_parameter_has_name(wrapper: int, n: int) -> bool: ...
+def interrogate_wrapper_parameter_name(wrapper: int, n: int) -> str: ...
+def interrogate_wrapper_parameter_is_this(wrapper: int, n: int) -> bool: ...
+def interrogate_wrapper_parameter_is_optional(wrapper: int, n: int) -> bool: ...
+def interrogate_wrapper_has_pointer(wrapper: int) -> bool: ...
+def interrogate_wrapper_pointer(wrapper: int) -> None: ...
+def interrogate_wrapper_unique_name(wrapper: int) -> str: ...
+def interrogate_get_wrapper_by_unique_name(unique_name: str) -> int: ...
+
+# MakeSeqs
+def interrogate_make_seq_seq_name(make_seq: int) -> str: ...
+def interrogate_make_seq_scoped_name(make_seq: int) -> str: ...
+def interrogate_make_seq_has_comment(make_seq: int) -> bool: ...
+def interrogate_make_seq_comment(make_seq: int) -> str: ...
+def interrogate_make_seq_num_name(make_seq: int) -> str: ...
+def interrogate_make_seq_element_name(make_seq: int) -> str: ...
+def interrogate_make_seq_num_getter(make_seq: int) -> int: ...
+def interrogate_make_seq_element_getter(make_seq: int) -> int: ...
+
+# Types
+def interrogate_number_of_global_types() -> int: ...
+def interrogate_get_global_type(n: int) -> int: ...
+def interrogate_number_of_types() -> int: ...
+def interrogate_get_type(n: int) -> int: ...
+def interrogate_get_type_by_name(type_name: str) -> int: ...
+def interrogate_get_type_by_scoped_name(type_name: str) -> int: ...
+def interrogate_get_type_by_true_name(type_name: str) -> int: ...
+def interrogate_type_is_global(type: int) -> bool: ...
+def interrogate_type_is_deprecated(type: int) -> bool: ...
+def interrogate_type_name(type: int) -> str: ...
+def interrogate_type_scoped_name(type: int) -> str: ...
+def interrogate_type_true_name(type: int) -> str: ...
+def interrogate_type_is_nested(type: int) -> bool: ...
+def interrogate_type_outer_class(type: int) -> int: ...
+def interrogate_type_has_comment(type: int) -> bool: ...
+def interrogate_type_comment(type: int) -> str: ...
+def interrogate_type_has_module_name(type: int) -> bool: ...
+def interrogate_type_module_name(type: int) -> str: ...
+def interrogate_type_has_library_name(type: int) -> bool: ...
+def interrogate_type_library_name(type: int) -> str: ...
+def interrogate_type_is_atomic(type: int) -> bool: ...
+def interrogate_type_atomic_token(type: int) -> int: ...
+def interrogate_type_is_unsigned(type: int) -> bool: ...
+def interrogate_type_is_signed(type: int) -> bool: ...
+def interrogate_type_is_long(type: int) -> bool: ...
+def interrogate_type_is_longlong(type: int) -> bool: ...
+def interrogate_type_is_short(type: int) -> bool: ...
+def interrogate_type_is_wrapped(type: int) -> bool: ...
+def interrogate_type_is_pointer(type: int) -> bool: ...
+def interrogate_type_is_const(type: int) -> bool: ...
+def interrogate_type_is_typedef(type: int) -> bool: ...
+def interrogate_type_wrapped_type(type: int) -> int: ...
+def interrogate_type_is_array(type: int) -> bool: ...
+def interrogate_type_array_size(type: int) -> int: ...
+def interrogate_type_is_enum(type: int) -> bool: ...
+def interrogate_type_is_scoped_enum(type: int) -> bool: ...
+def interrogate_type_number_of_enum_values(type: int) -> int: ...
+def interrogate_type_enum_value_name(type: int, n: int) -> str: ...
+def interrogate_type_enum_value_scoped_name(type: int, n: int) -> str: ...
+def interrogate_type_enum_value_comment(type: int, n: int) -> str: ...
+def interrogate_type_enum_value(type: int, n: int) -> int: ...
+def interrogate_type_is_struct(type: int) -> bool: ...
+def interrogate_type_is_class(type: int) -> bool: ...
+def interrogate_type_is_union(type: int) -> bool: ...
+def interrogate_type_is_fully_defined(type: int) -> bool: ...
+def interrogate_type_is_unpublished(type: int) -> bool: ...
+def interrogate_type_number_of_constructors(type: int) -> int: ...
+def interrogate_type_get_constructor(type: int, n: int) -> int: ...
+def interrogate_type_has_destructor(type: int) -> bool: ...
+def interrogate_type_destructor_is_inherited(type: int) -> bool: ...
+def interrogate_type_get_destructor(type: int) -> int: ...
+def interrogate_type_number_of_elements(type: int) -> int: ...
+def interrogate_type_get_element(type: int, n: int) -> int: ...
+def interrogate_type_number_of_methods(type: int) -> int: ...
+def interrogate_type_get_method(type: int, n: int) -> int: ...
+def interrogate_type_number_of_make_seqs(type: int) -> int: ...
+def interrogate_type_get_make_seq(type: int, n: int) -> int: ...
+def interrogate_type_number_of_casts(type: int) -> int: ...
+def interrogate_type_get_cast(type: int, n: int) -> int: ...
+def interrogate_type_number_of_derivations(type: int) -> int: ...
+def interrogate_type_get_derivation(type: int, n: int) -> int: ...
+def interrogate_type_is_final(type: int) -> bool: ...
+def interrogate_type_derivation_has_upcast(type: int, n: int) -> bool: ...
+def interrogate_type_get_upcast(type: int, n: int) -> int: ...
+def interrogate_type_derivation_downcast_is_impossible(type: int, n: int) -> bool: ...
+def interrogate_type_derivation_has_downcast(type: int, n: int) -> bool: ...
+def interrogate_type_get_downcast(type: int, n: int) -> int: ...
+def interrogate_type_number_of_nested_types(type: int) -> int: ...
+def interrogate_type_get_nested_type(type: int, n: int) -> int: ...

{panda3d_interrogate-0.1.1 → panda3d_interrogate-0.3.0}/src/interrogatedb/py_compat.h

@@ -189,6 +189,20 @@ INLINE PyObject *_PyObject_FastCall(PyObject *func, PyObject **args, Py_ssize_t
   } while (0)
 #endif
 
+#if PY_VERSION_HEX < 0x03070000
+INLINE PyObject *PyImport_GetModule(PyObject *name) {
+  PyObject *modules = PyImport_GetModuleDict();
+  if (modules != nullptr) {
+    PyObject *module = PyDict_GetItem(modules, name);
+    if (module != nullptr) {
+      Py_INCREF(module);
+      return module;
+    }
+  }
+  return nullptr;
+}
+#endif
+
 /* Python 3.8 */
 #if PY_VERSION_HEX < 0x03080000
 INLINE PyObject *_PyLong_Rshift(PyObject *a, size_t shiftby) {
@@ -267,6 +281,18 @@ ALWAYS_INLINE PyObject *Py_XNewRef(PyObject *obj) {
 }
 #endif
 
+/* Python 3.11 */
+
+#if PY_VERSION_HEX < 0x030B0000
+INLINE PyObject *PyType_GetName(PyTypeObject *type) {
+  return PyObject_GetAttrString((PyObject *)type, "__name__");
+}
+
+INLINE PyObject *PyType_GetQualName(PyTypeObject *type) {
+  return PyObject_GetAttrString((PyObject *)type, "__qualname__");
+}
+#endif
+
 /* Python 3.12 */
 
 #if PY_VERSION_HEX < 0x030C0000

{panda3d_interrogate-0.1.1 → panda3d_interrogate-0.3.0}/src/interrogatedb/py_panda.cxx

@@ -375,23 +375,26 @@ static PyObject *Dtool_EnumType_Repr(PyObject *self) {
  * should be a tuple of (name, value) pairs.
  */
 PyTypeObject *Dtool_EnumType_Create(const char *name, PyObject *names, const char *module) {
-  static PyObject *enum_class = nullptr;
 #if PY_VERSION_HEX >= 0x03040000
-  static PyObject *enum_meta = nullptr;
-  static PyObject *enum_create = nullptr;
-  if (enum_meta == nullptr) {
-    PyObject *enum_module = PyImport_ImportModule("enum");
-    nassertr_always(enum_module != nullptr, nullptr);
+  PyObject *enum_module = PyImport_ImportModule("enum");
+  nassertr_always(enum_module != nullptr, nullptr);
 
-    enum_class = PyObject_GetAttrString(enum_module, "Enum");
-    enum_meta = PyObject_GetAttrString(enum_module, "EnumMeta");
-    enum_create = PyObject_GetAttrString(enum_meta, "_create_");
-    nassertr(enum_meta != nullptr, nullptr);
-  }
+  PyObject *enum_meta = PyObject_GetAttrString(enum_module, "EnumMeta");
+  nassertr(enum_meta != nullptr, nullptr);
+
+  PyObject *enum_class = PyObject_GetAttrString(enum_module, "Enum");
+  Py_DECREF(enum_module);
+  nassertr(enum_class != nullptr, nullptr);
+
+  PyObject *enum_create = PyObject_GetAttrString(enum_meta, "_create_");
+  Py_DECREF(enum_meta);
 
   PyObject *result = PyObject_CallFunction(enum_create, (char *)"OsN", enum_class, name, names);
+  Py_DECREF(enum_create);
+  Py_DECREF(enum_class);
   nassertr(result != nullptr, nullptr);
 #else
+  static PyObject *enum_class = nullptr;
   static PyObject *name_str;
   static PyObject *name_sunder_str;
   static PyObject *value_str;
@@ -528,16 +531,39 @@ PyObject *DTool_CreatePyInstance(void *local_this, Dtool_PyTypedObject &in_class
  * Returns a borrowed reference to the global type dictionary.
  */
 Dtool_TypeMap *Dtool_GetGlobalTypeMap() {
+#if PY_VERSION_HEX >= 0x030d0000 // 3.13
+  PyObject *istate_dict = PyInterpreterState_GetDict(PyInterpreterState_Get());
+  PyObject *key = PyUnicode_InternFromString("_interrogate_types");
+  PyObject *capsule = PyDict_GetItem(istate_dict, key);
+  if (capsule != nullptr) {
+    Py_DECREF(key);
+    return (Dtool_TypeMap *)PyCapsule_GetPointer(capsule, nullptr);
+  }
+#else
   PyObject *capsule = PySys_GetObject((char *)"_interrogate_types");
   if (capsule != nullptr) {
     return (Dtool_TypeMap *)PyCapsule_GetPointer(capsule, nullptr);
-  } else {
-    Dtool_TypeMap *type_map = new Dtool_TypeMap;
-    capsule = PyCapsule_New((void *)type_map, nullptr, nullptr);
-    PySys_SetObject((char *)"_interrogate_types", capsule);
+  }
+#endif
+
+  Dtool_TypeMap *type_map = new Dtool_TypeMap;
+  capsule = PyCapsule_New((void *)type_map, nullptr, nullptr);
+
+#if PY_VERSION_HEX >= 0x030d0000 // 3.13
+  PyObject *result;
+  if (PyDict_SetDefaultRef(istate_dict, key, capsule, &result) != 0) {
+    // Another thread already beat us to it.
     Py_DECREF(capsule);
-    return type_map;
+    delete type_map;
+    capsule = result;
+    type_map = (Dtool_TypeMap *)PyCapsule_GetPointer(capsule, nullptr);
   }
+  Py_DECREF(key);
+#endif
+
+  PySys_SetObject((char *)"_interrogate_types", capsule);
+  Py_DECREF(capsule);
+  return type_map;
 }
 
 /**
@@ -594,6 +620,10 @@ PyObject *Dtool_PyModuleInitHelper(const LibraryDef *defs[], const char *modulen
 
   Dtool_TypeMap *type_map = Dtool_GetGlobalTypeMap();
 
+#ifdef Py_GIL_DISABLED
+  PyMutex_Lock(&type_map->_lock);
+#endif
+
   // the module level function inits....
   MethodDefmap functions;
   for (size_t i = 0; defs[i] != nullptr; i++) {
@@ -627,12 +657,19 @@ PyObject *Dtool_PyModuleInitHelper(const LibraryDef *defs[], const char *modulen
         if (it != type_map->end()) {
           types->type = it->second;
         } else {
-          return PyErr_Format(PyExc_NameError, "name '%s' is not defined", types->name);
+          PyErr_Format(PyExc_NameError, "name '%s' is not defined", types->name);
+#ifdef Py_GIL_DISABLED
+          PyMutex_Unlock(&type_map->_lock);
+#endif
+          return nullptr;
         }
         ++types;
       }
     }
   }
+#ifdef Py_GIL_DISABLED
+  PyMutex_Unlock(&type_map->_lock);
+#endif
 
   PyMethodDef *newdef = new PyMethodDef[functions.size() + 1];
   MethodDefmap::iterator mi;

{panda3d_interrogate-0.1.1 → panda3d_interrogate-0.3.0}/src/interrogatedb/py_panda.h

@@ -174,7 +174,14 @@ static void Dtool_FreeInstance_##CLASS_NAME(PyObject *self) {\
 // forward declared of typed object.  We rely on the fact that typed objects
 // are uniquly defined by an integer.
 
+#if PY_VERSION_HEX >= 0x030d0000
+class Dtool_TypeMap : public std::map<std::string, Dtool_PyTypedObject *> {
+public:
+  PyMutex _lock { 0 };
+};
+#else
 typedef std::map<std::string, Dtool_PyTypedObject *> Dtool_TypeMap;
+#endif
 
 EXPCL_PYPANDA Dtool_TypeMap *Dtool_GetGlobalTypeMap();
 

{panda3d_interrogate-0.1.1 → panda3d_interrogate-0.3.0}/src/interrogatedb/py_wrappers.cxx

@@ -17,27 +17,33 @@
 #endif
 
 static void _register_collection(PyTypeObject *type, const char *abc) {
-  PyObject *sys_modules = PyImport_GetModuleDict();
-  if (sys_modules != nullptr) {
-    PyObject *module = PyDict_GetItemString(sys_modules, _COLLECTIONS_ABC);
-    if (module != nullptr) {
-      PyObject *dict = PyModule_GetDict(module);
-      if (module != nullptr) {
 #if PY_MAJOR_VERSION >= 3
-        PyObject *register_str = PyUnicode_InternFromString("register");
+  PyObject *module_name = PyUnicode_InternFromString(_COLLECTIONS_ABC);
 #else
-        PyObject *register_str = PyString_InternFromString("register");
+  PyObject *module_name = PyString_InternFromString(_COLLECTIONS_ABC);
 #endif
-        PyObject *obj = nullptr;
-        if (register_str == nullptr ||
-            PyDict_GetItemStringRef(dict, abc, &obj) <= 0 ||
-            PyObject_CallMethodOneArg(obj, register_str, (PyObject *)type) == nullptr) {
-          PyErr_Print();
-        }
-        Py_XDECREF(obj);
-        Py_XDECREF(register_str);
+  PyObject *module = PyImport_GetModule(module_name);
+  Py_DECREF(module_name);
+  if (module != nullptr) {
+    PyObject *dict = PyModule_GetDict(module);
+    if (dict != nullptr) {
+#if PY_MAJOR_VERSION >= 3
+      PyObject *register_str = PyUnicode_InternFromString("register");
+#else
+      PyObject *register_str = PyString_InternFromString("register");
+#endif
+      PyObject *obj = nullptr;
+      if (register_str == nullptr ||
+          PyDict_GetItemStringRef(dict, abc, &obj) <= 0 ||
+          PyObject_CallMethodOneArg(obj, register_str, (PyObject *)type) == nullptr) {
+        PyErr_Print();
       }
+      Py_XDECREF(obj);
+      Py_XDECREF(register_str);
+    } else {
+      PyErr_Clear();
     }
+    Py_DECREF(module);
   }
 }