panda3d-interrogate 0.6.0__tar.gz → 0.6.1__tar.gz

{panda3d_interrogate-0.6.0 → panda3d_interrogate-0.6.1}/PKG-INFO

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

{panda3d_interrogate-0.6.0 → panda3d_interrogate-0.6.1}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "panda3d-interrogate"
-version = "0.6.0"
+version = "0.6.1"
 description = "Binding generator designed for Panda3D"
 readme = "README.md"
 requires-python = ">=3.2"

{panda3d_interrogate-0.6.0 → panda3d_interrogate-0.6.1}/src/interrogate/interfaceMakerPythonNative.cxx

@@ -3628,6 +3628,8 @@ write_module_class(ostream &out, Object *obj) {
     }
   }
 
+  bool wrote_enum_prep_code = false;
+
   // Build type dictionary.  The size is just an estimation.
   if (num_dict_items > 5) {
     out << "    PyObject *dict = _PyDict_NewPresized(" << num_dict_items << ");\n";
@@ -3685,6 +3687,20 @@ write_module_class(ostream &out, Object *obj) {
       string class_name = nested_obj->_itype._cpptype->get_local_name(&parser);
       string safe_name = make_safe_name(class_name);
 
+      if (!wrote_enum_prep_code) {
+        wrote_enum_prep_code = true;
+
+        out << "#if PY_VERSION_HEX >= 0x03040000\n";
+        out << "    PyObject *enum_module = PyImport_ImportModule(\"enum\");\n";
+        out << "    PyObject *enum_meta = PyObject_GetAttrString(enum_module, \"EnumMeta\");\n";
+        out << "    PyObject *enum_class = PyObject_GetAttrString(enum_module, \"Enum\");\n";
+        out << "    Py_DECREF(enum_module);\n";
+        out << "    PyObject *enum_create = PyObject_GetAttrString(enum_meta, \"_create_\");\n";
+        out << "    Py_DECREF(enum_meta);\n";
+        out << "    PyObject *module_name = PyUnicode_FromString(\"" << _def->module_name << "\");\n";
+        out << "#endif\n";
+      }
+
       int enum_count = nested_obj->_itype.number_of_enum_values();
       CPPType *underlying_type = TypeManager::unwrap_const(nested_obj->_itype._cpptype->as_enum_type()->get_underlying_type());
       string cast_to = underlying_type->get_local_name(&parser);
@@ -3706,9 +3722,16 @@ write_module_class(ostream &out, Object *obj) {
             << nested_obj->_itype.get_enum_value_name(xx) << "));\n"
                "      PyTuple_SET_ITEM(members, " << xx << ", member);\n";
       }
-      out << "      Dtool_Ptr_" << safe_name << " = Dtool_EnumType_Create(\""
+      out << "#if PY_VERSION_HEX >= 0x03040000\n"
+          << "      Dtool_Ptr_" << safe_name << " = (PyTypeObject *)PyObject_CallFunction("
+          << "enum_create, (char *)\"OsN\", enum_class, \""
+          << nested_obj->_itype.get_name() << "\", members);\n"
+          << "      PyObject_SetAttrString((PyObject *)Dtool_Ptr_" << safe_name << ", \"__module__\", module_name);\n"
+          << "#else\n"
+          << "      Dtool_Ptr_" << safe_name << " = Dtool_EnumType_Create(\""
           << nested_obj->_itype.get_name() << "\", members, \""
-          << _def->module_name << "\");\n";
+          << _def->module_name << "\");\n"
+          << "#endif\n";
       out << "      PyDict_SetItemString(dict, \"" << nested_obj->_itype.get_name()
           << "\", (PyObject *)Dtool_Ptr_" << safe_name << ");\n";
       out << "    }\n";
@@ -3737,6 +3760,14 @@ write_module_class(ostream &out, Object *obj) {
     }
   }
 
+  if (wrote_enum_prep_code) {
+    out << "#if PY_VERSION_HEX >= 0x03040000\n";
+    out << "    Py_DECREF(enum_create);\n";
+    out << "    Py_DECREF(enum_class);\n";
+    out << "    Py_DECREF(module_name);\n";
+    out << "#endif\n";
+  }
+
   // Also add the static properties, which can't be added via getset.
   for (Property *property : obj->_properties) {
     const InterrogateElement &ielem = property->_ielement;

{panda3d_interrogate-0.6.0 → panda3d_interrogate-0.6.1}/src/interrogatedb/py_compat.h

@@ -380,6 +380,12 @@ PyDict_GetItemStringRef(PyObject *mp, const char *key, PyObject **result) {
 #  define Py_END_CRITICAL_SECTION2() }
 #endif
 
+/* Python 3.14 */
+
+#if PY_VERSION_HEX < 0x030E00A8
+#  define PyUnstable_Object_IsUniquelyReferenced(op) (Py_REFCNT((op)) == 1)
+#endif
+
 /* Other Python implementations */
 
 #endif  // HAVE_PYTHON

{panda3d_interrogate-0.6.0 → panda3d_interrogate-0.6.1}/src/interrogatedb/py_wrappers.cxx

@@ -965,6 +965,53 @@ static PyObject *Dtool_MutableMappingWrapper_update(PyObject *self, PyObject *ar
   return Py_XNewRef(result);
 }
 
+/**
+ * "send" method, accepts only None.
+ */
+static PyObject *Dtool_GeneratorWrapper_send(PyObject *self, PyObject *arg) {
+  Dtool_GeneratorWrapper *wrap = (Dtool_GeneratorWrapper *)self;
+  nassertr(wrap, nullptr);
+  nassertr(wrap->_iternext_func, nullptr);
+  if (arg == Py_None) {
+    return wrap->_iternext_func(wrap->_base._self);
+  } else {
+    return Dtool_Raise_TypeError("can't send non-None value to a just-started generator");
+  }
+}
+
+/**
+ * "throw" method, simply re-raises exception.
+ */
+static PyObject *Dtool_GeneratorWrapper_throw(PyObject *self, PyObject *args) {
+  Dtool_GeneratorWrapper *wrap = (Dtool_GeneratorWrapper *)self;
+  nassertr(wrap, nullptr);
+
+  Py_ssize_t nargs = PyTuple_GET_SIZE(args);
+  if (nargs < 1 || nargs > 3) {
+    return PyErr_Format(PyExc_TypeError, "throw() takes 1, 2 or 3 arguments");
+  }
+
+  PyObject *exc_type = PyTuple_GET_ITEM(args, 0);
+  PyObject *exc_val = (nargs >= 2) ? PyTuple_GET_ITEM(args, 1) : nullptr;
+  PyObject *exc_tb = (nargs >= 3) ? PyTuple_GET_ITEM(args, 2) : nullptr;
+  if (exc_val == nullptr && exc_tb == nullptr && PyExceptionInstance_Check(exc_type)) {
+    // We were just given an exception instance.
+#if PY_VERSION_HEX >= 0x030C0000 // 3.12
+    Py_INCREF(exc_type);
+    PyErr_SetRaisedException(exc_type);
+    return nullptr;
+#else
+    exc_val = exc_type;
+    exc_type = (PyObject *)Py_TYPE(exc_val);
+#endif
+  }
+  Py_XINCREF(exc_type);
+  Py_XINCREF(exc_val);
+  Py_XINCREF(exc_tb);
+  PyErr_Restore(exc_type, exc_val, exc_tb);
+  return nullptr;
+}
+
 /**
  * This variant defines only a generator interface.
  */
@@ -1246,11 +1293,18 @@ Dtool_MappingWrapper *Dtool_NewMutableMappingWrapper(PyObject *self, const char
  */
 PyObject *
 Dtool_NewGenerator(PyObject *self, iternextfunc gen_next) {
+  static PyMethodDef methods[] = {
+    {"send", &Dtool_GeneratorWrapper_send, METH_O, nullptr},
+    {"throw", &Dtool_GeneratorWrapper_throw, METH_VARARGS, nullptr},
+    {nullptr, nullptr, 0, nullptr}
+  };
+
   static PyType_Slot wrapper_slots[] = {
     {Py_tp_dealloc, (void *)&Dtool_WrapperBase_dealloc},
     {Py_tp_repr, (void *)&Dtool_SequenceWrapper_repr},
     {Py_tp_iter, (void *)&PyObject_SelfIter},
     {Py_tp_iternext, (void *)&Dtool_GeneratorWrapper_iternext},
+    {Py_tp_methods, (void *)methods},
     {0, nullptr},
   };