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

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

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

panda3d_interrogate-0.7.0/cmake/scripts/MergeIncludes.cmake

@@ -0,0 +1,104 @@
+# Filename: MergeIncludes.cmake
+#
+# Description: When run, creates a single C++ file which expands all local
+#   #include statements (ie. those that use double quotes and not angle brackets)
+#
+# Usage:
+#   This script is invoked via add_custom_target, like this:
+#   cmake -D OUTPUT_FILE="out.cxx" -D INPUT_FILES="a.h b.h" -P MergeIncludes.cmake
+#
+
+cmake_minimum_required(VERSION 3.5)
+
+if(NOT CMAKE_SCRIPT_MODE_FILE)
+  message(FATAL_ERROR "MergeIncludes.cmake should not be included but run in script mode.")
+  return()
+endif()
+
+if(NOT DEFINED OUTPUT_FILE)
+  message(FATAL_ERROR "OUTPUT_FILE should be defined when running MergeIncludes.cmake!")
+  return()
+endif()
+
+file(WRITE "${OUTPUT_FILE}" "/* Generated file.  DO NOT EDIT. */
+\n")
+
+separate_arguments(INPUT_FILES)
+
+function(_merge_includes _current_file _output_list_var _output_source_var)
+  list(APPEND ${_output_list_var} "${_current_file}")
+  set(_other_output_source "${${_output_source_var}}")
+  set(_this_output_source "#line 1 \"${_current_file}\"\n")
+
+  # Find all include directives
+  file(READ "${_current_file}" _file_content)
+  string(REPLACE ";" "\\;" _file_content "${_file_content}")
+  string(REPLACE "\r\n" "\n" _file_content "${_file_content}")
+  string(REPLACE "\r" "\n" _file_content "${_file_content}")
+  string(REPLACE "\\\n" "<ESCAPED_NEWLINE>" _file_content "${_file_content}")
+  string(REPLACE "\n" ";" _file_content "${_file_content}")
+  string(REPLACE "<ESCAPED_NEWLINE>" "\\\n" _file_content "${_file_content}")
+  set(_include_regex "^[ \t]*#[ \t]*include[ \t]+\"([^\"]+)\"")
+  set(_pragma_once_regex "^[ \t]*#[ \t]*pragma[ \t]+once")
+
+  get_filename_component(_current_dir "${_current_file}" DIRECTORY)
+
+  foreach(_line IN LISTS _file_content)
+    if(_line MATCHES "${_include_regex}")
+      set(_include_full_path "${_current_dir}/${CMAKE_MATCH_1}")
+
+      if(EXISTS "${_include_full_path}")
+        if ("${_include_full_path}" MATCHES ".[hH](h|pp|xx)?$")
+          if(NOT "${_include_full_path}" IN_LIST ${_output_list_var})
+            set(_this_output_source "${_this_output_source}//${_line}\n")
+            _merge_includes(
+              "${_include_full_path}"
+              "${_output_list_var}"
+              _other_output_source
+            )
+          else()
+            set(_this_output_source "${_this_output_source}//${_line}\n")
+          endif()
+        else()
+          set(_this_output_source "${_this_output_source}//${_line} inlined\n")
+
+          # Do this in-place.
+          _merge_includes(
+            "${_include_full_path}"
+            "${_output_list_var}"
+            _this_output_source
+          )
+        endif()
+
+      else()
+        set(_this_output_source "${_this_output_source}${_line}\n")
+      endif()
+
+    elseif(_line MATCHES "${_pragma_once_regex}")
+      # Strip these out.
+      set(_this_output_source "${_this_output_source}//${_line}\n")
+
+    else()
+      set(_this_output_source "${_this_output_source}${_line}\n")
+
+    endif()
+  endforeach()
+
+  # Propagate the updated lists to the calling scope.
+  set(${_output_list_var} ${${_output_list_var}} PARENT_SCOPE)
+  set(${_output_source_var} "${_other_output_source}${_this_output_source}" PARENT_SCOPE)
+endfunction()
+
+file(WRITE "${OUTPUT_FILE}" "/* Generated by CMake.  DO NOT EDIT. */\n\n")
+
+set(_output_list "")
+
+foreach(infile ${INPUT_FILES})
+  get_filename_component(_absfile "${infile}" ABSOLUTE)
+
+  if(NOT "${_absfile}" IN_LIST _output_list)
+    set(_output_source "// input file ${infile}\n")
+    _merge_includes("${_absfile}" _output_list _output_source)
+    file(APPEND "${OUTPUT_FILE}" "${_output_source}")
+  endif()
+endforeach()

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

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

{panda3d_interrogate-0.6.0 → panda3d_interrogate-0.7.0}/src/interrogate/CMakeLists.txt

@@ -51,47 +51,92 @@ set(INTERROGATE_SOURCES
   typeManager.cxx
 )
 
-set(INTERROGATE_PREAMBLE_PYTHON_NATIVE
+set(INTERROGATE_PREAMBLE_PYTHON_NATIVE_HEADERS
+  ../interrogatedb/py_panda.h
+  ../interrogatedb/py_panda.I
+  ../interrogatedb/py_support.h
+  ../interrogatedb/py_support.I
+  ../interrogatedb/py_compat.h
+  ../interrogatedb/py_wrappers.h
+  ../interrogatedb/extension.h
+)
+
+set(INTERROGATE_PREAMBLE_PYTHON_NATIVE_SOURCES
   ../interrogatedb/py_panda.cxx
+  ../interrogatedb/py_support.cxx
   ../interrogatedb/py_compat.cxx
   ../interrogatedb/py_wrappers.cxx
   ../interrogatedb/dtool_super_base.cxx
 )
 
-composite_sources(interrogate INTERROGATE_SOURCES)
-add_executable(interrogate ${INTERROGATE_HEADERS} ${INTERROGATE_SOURCES})
-target_link_libraries(interrogate cppParser interrogatedb)
-
-# parse_file utility
-add_executable(parse_file parse_file.cxx)
-target_link_libraries(parse_file cppParser)
-
 # Python preamble for interrogate_module
-set(_preamble_files)
-foreach(_file ${INTERROGATE_PREAMBLE_PYTHON_NATIVE})
-  # Resolve symlinks, use absolute path, and add a `#line 1 ...` directive
+set(_preamble_sources)
+set(_preamble_headers)
+foreach(_file ${INTERROGATE_PREAMBLE_PYTHON_NATIVE_HEADERS})
+  # Resolve symlinks, use absolute path
   get_filename_component(_file "${_file}" REALPATH)
-
-  string(SHA1 _hash "${_file}")
-  set(_line_file "${CMAKE_CURRENT_BINARY_DIR}/.${_hash}.h")
-  file(WRITE "${_line_file}" "#line 1 \"${_file}\"\n")
-
-  list(APPEND _preamble_files "${_line_file}")
-  list(APPEND _preamble_files "${_file}")
+  list(APPEND _preamble_headers "${_file}")
+  list(APPEND _preamble_sources "${_file}")
+endforeach(_file)
+foreach(_file ${INTERROGATE_PREAMBLE_PYTHON_NATIVE_SOURCES})
+  # Resolve symlinks, use absolute path
+  get_filename_component(_file "${_file}" REALPATH)
+  list(APPEND _preamble_sources "${_file}")
 endforeach(_file)
 
+add_custom_command(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/interrogate_preamble_python_native.h
+  COMMAND ${CMAKE_COMMAND}
+    -D OUTPUT_FILE="${CMAKE_CURRENT_BINARY_DIR}/interrogate_preamble_python_native.h"
+    -D INPUT_FILES="${_preamble_headers}"
+    -D PREPEND_LINE_DIRECTIVE=YES
+    -D REPLACE_INCLUDES=YES
+    -P ${PROJECT_SOURCE_DIR}/cmake/scripts/MergeIncludes.cmake
+  DEPENDS ${_preamble_headers}
+  WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
+
 add_custom_command(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/interrogate_preamble_python_native.cxx
   COMMAND ${CMAKE_COMMAND}
     -D OUTPUT_FILE="${CMAKE_CURRENT_BINARY_DIR}/interrogate_preamble_python_native.cxx"
-    -D INPUT_FILES="${_preamble_files}"
+    -D INPUT_FILES="${_preamble_sources}"
+    -P ${PROJECT_SOURCE_DIR}/cmake/scripts/MergeIncludes.cmake
+  DEPENDS ${_preamble_sources} ${_preamble_headers}
+  WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
+
+add_custom_command(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/interrogate_preamble_python_native.h.cxx
+  COMMAND ${CMAKE_COMMAND}
+    -D OUTPUT_FILE="${CMAKE_CURRENT_BINARY_DIR}/interrogate_preamble_python_native.h.cxx"
+    -D INPUT_FILES="${CMAKE_CURRENT_BINARY_DIR}/interrogate_preamble_python_native.h"
+    -D SYMBOL_NAME="interrogate_preamble_python_native_h"
+    -D PREPEND_LINE_DIRECTIVE=YES
+    -D REPLACE_INCLUDES=YES
+    -P ${PROJECT_SOURCE_DIR}/cmake/scripts/ConcatenateToCXX.cmake
+  DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/interrogate_preamble_python_native.h"
+  WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
+
+add_custom_command(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/interrogate_preamble_python_native.cxx.cxx
+  COMMAND ${CMAKE_COMMAND}
+    -D OUTPUT_FILE="${CMAKE_CURRENT_BINARY_DIR}/interrogate_preamble_python_native.cxx.cxx"
+    -D INPUT_FILES="${CMAKE_CURRENT_BINARY_DIR}/interrogate_preamble_python_native.cxx"
     -D SYMBOL_NAME="interrogate_preamble_python_native"
     -P ${PROJECT_SOURCE_DIR}/cmake/scripts/ConcatenateToCXX.cmake
-  DEPENDS ${INTERROGATE_PREAMBLE_PYTHON_NATIVE}
+  DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/interrogate_preamble_python_native.cxx"
   WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
 
+composite_sources(interrogate INTERROGATE_SOURCES)
+add_executable(interrogate ${INTERROGATE_SOURCES}
+  ${CMAKE_CURRENT_BINARY_DIR}/interrogate_preamble_python_native.h.cxx)
+target_link_libraries(interrogate cppParser interrogatedb)
+
+# parse_file utility
+add_executable(parse_file parse_file.cxx)
+target_link_libraries(parse_file cppParser)
+
 add_executable(interrogate_module interrogate_module.cxx
-  ${CMAKE_CURRENT_BINARY_DIR}/interrogate_preamble_python_native.cxx)
+  ${CMAKE_CURRENT_BINARY_DIR}/interrogate_preamble_python_native.cxx.cxx)
 target_link_libraries(interrogate_module cppParser interrogatedb)
 
 if(NOT CMAKE_CROSSCOMPILING)
@@ -124,5 +169,4 @@ if(SKBUILD)
   install(TARGETS interrogate_module COMPONENT tools DESTINATION interrogate_module)
 else()
   install(TARGETS interrogate interrogate_module COMPONENT tools DESTINATION ${CMAKE_INSTALL_BINDIR})
-  #install(FILES ${INTERROGATE_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/interrogate)
 endif()

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

@@ -861,7 +861,7 @@ InterfaceMakerPythonNative::
 void InterfaceMakerPythonNative::
 write_prototypes(ostream &out_code, ostream *out_h) {
   if (out_h != nullptr) {
-    *out_h << "#include \"py_panda.h\"\n\n";
+    //*out_h << "#include \"py_panda.h\"\n\n";
   }
 
   /*
@@ -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.7.0}/src/interrogate/interrogate.cxx

@@ -24,6 +24,9 @@
 using std::cerr;
 using std::string;
 
+// This contains a big source string determined at compile time.
+extern const char interrogate_preamble_python_native_h[];
+
 CPPParser parser;
 
 Filename output_code_filename;
@@ -592,12 +595,9 @@ main(int argc, char **argv) {
   int status = 0;
 
   // Now output all of the wrapper functions.
-  if (!output_code_filename.empty())
-  {
-    std::ofstream output_code;
-    output_code_filename.open_write(output_code);
-
-    output_code
+  if (!output_code_filename.empty()) {
+    std::ostringstream output_buffer;
+    output_buffer
       << "/*\n"
       << " * This file was generated by:\n"
       << " * " << command_line << "\n"
@@ -605,10 +605,31 @@ main(int argc, char **argv) {
       << " */\n\n";
 
     if (the_output_include != nullptr) {
-      output_code << "#include \"" << output_include_filename << "\"\n";
+      output_buffer << "#include \"" << output_include_filename << "\"\n";
       *the_output_include << "#include \"" << output_include_filename.get_fullpath_wo_extension() << "_pynative.h\"\n";
     }
 
+    if (build_python_native) {
+      output_buffer << interrogate_preamble_python_native_h << "\n";
+    }
+
+    std::string output_buffer_str = output_buffer.str();
+
+    std::ofstream output_code;
+    output_code_filename.open_write(output_code);
+
+    output_code << output_buffer_str;
+
+    if (build_python_native) {
+      int lineno = 2;
+      for (char c : output_buffer_str) {
+        if (c == '\n') {
+          ++lineno;
+        }
+      }
+      output_code << "#line " << lineno << " \"" << output_code_filename << "\"\n";
+    }
+
     if (output_code.fail()) {
       nout << "Unable to write to " << output_code_filename << "\n";
       status = -1;

{panda3d_interrogate-0.6.0 → panda3d_interrogate-0.7.0}/src/interrogate/interrogateBuilder.cxx

@@ -387,12 +387,6 @@ write_code(ostream &out_code,ostream * out_include, InterrogateModuleDef *def) {
   }
 
   declaration_bodies << "#include <sstream>\n";
-
-  if (build_python_native) {
-    declaration_bodies << "#include \"py_panda.h\"\n";
-    declaration_bodies << "#include \"extension.h\"\n";
-    declaration_bodies << "#include \"dcast.h\"\n";
-  }
   declaration_bodies << "\n";
 
   IncludeFiles::const_iterator ifi;

{panda3d_interrogate-0.6.0 → panda3d_interrogate-0.7.0}/src/interrogate/interrogate_module.cxx

@@ -161,8 +161,6 @@ static bool print_dependent_types(const string &lib1, const string &lib2) {
 }
 
 int write_python_table_native(std::ostream &out) {
-  out << "#include \"py_panda.h\"\n\n";
-
   int count = 0;
 
   std::map<string, std::set<string> > dependencies;
@@ -619,11 +617,33 @@ int main(int argc, char *argv[]) {
 
   // Now output the table.
   if (!output_code_filename.empty()) {
+    std::string output_buffer_str;
+    {
+      std::ostringstream output_buffer;
+
+      // Output the support code.
+      if (build_python_native_wrappers) {
+        output_buffer << interrogate_preamble_python_native << "\n";
+      }
+      output_buffer_str = output_buffer.str();
+    }
+
     std::ofstream output_code;
 
     if (!output_code_filename.open_write(output_code)) {
       nout << "Unable to write to " << output_code_filename << "\n";
     } else {
+      output_code << output_buffer_str;
+
+      if (build_python_native_wrappers) {
+        int lineno = 2;
+        for (char c : output_buffer_str) {
+          if (c == '\n') {
+            ++lineno;
+          }
+        }
+        output_code << "#line " << lineno << " \"" << output_code_filename << "\"\n";
+      }
 
       if (build_python_wrappers) {
         int count = write_python_table(output_code);
@@ -632,9 +652,6 @@ int main(int argc, char *argv[]) {
 
       if (build_python_native_wrappers) {
         write_python_table_native(output_code);
-
-        // Output the support code.
-        output_code << interrogate_preamble_python_native << "\n";
       }
     }
   }

{panda3d_interrogate-0.6.0 → panda3d_interrogate-0.7.0}/src/interrogatedb/CMakeLists.txt

@@ -29,10 +29,6 @@ set(INTERROGATEDB_IGATE
   interrogate_request.h
 )
 
-set(IGATERUNTIME_HEADERS
-  extension.h py_compat.h py_panda.h py_panda.I py_wrappers.h
-)
-
 composite_sources(interrogatedb INTERROGATEDB_SOURCES)
 add_library(interrogatedb
   ${INTERROGATEDB_HEADERS} ${INTERROGATEDB_SOURCES})
@@ -44,7 +40,6 @@ install(TARGETS interrogatedb
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
   INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/interrogatedb)
 install(FILES ${INTERROGATEDB_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/interrogatedb)
-install(FILES ${IGATERUNTIME_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/interrogatedb)
 
 # ALSO: This has an Interrogate binding! Take care of that if we want it.
 # Note we don't use the regular Interrogate macros; this has some custom flags

{panda3d_interrogate-0.6.0 → panda3d_interrogate-0.7.0}/src/interrogatedb/interrogate_request.h

@@ -44,12 +44,12 @@ EXPCL_INTERROGATEDB void interrogate_request_database(const char *database_filen
 
 /* The more sophisticated interface uses these structures. */
 
-typedef struct {
+typedef struct InterrogateUniqueNameDef {
   const char *name;
   int index_offset;
 } InterrogateUniqueNameDef;
 
-typedef struct {
+typedef struct InterrogateModuleDef {
   int file_identifier;
 
   const char *library_name;

{panda3d_interrogate-0.6.0 → panda3d_interrogate-0.7.0}/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.7.0}/src/interrogatedb/py_panda.I

@@ -59,63 +59,6 @@ DtoolInstance_GetPointer(PyObject *self, T *&into, Dtool_PyTypedObject &target_c
   return false;
 }
 
-/**
- * Function to create a hash from a wrapped Python object.
- */
-INLINE Py_hash_t DtoolInstance_HashPointer(PyObject *self) {
-  if (self != nullptr && DtoolInstance_Check(self)) {
-    return (Py_hash_t)(intptr_t)DtoolInstance_VOID_PTR(self);
-  }
-  return -1;
-}
-
-/**
- * Python 2-style comparison function that compares objects by pointer.
- */
-INLINE int DtoolInstance_ComparePointers(PyObject *v1, PyObject *v2) {
-  void *v1_this = DtoolInstance_Check(v1) ? DtoolInstance_VOID_PTR(v1) : nullptr;
-  void *v2_this = DtoolInstance_Check(v2) ? DtoolInstance_VOID_PTR(v2) : nullptr;
-  if (v1_this != nullptr && v2_this != nullptr) {
-    return (v1_this > v2_this) - (v1_this < v2_this);
-  } else {
-    return (v1 > v2) - (v1 < v2);
-  }
-}
-
-/**
- * Rich comparison function that compares objects by pointer.
- */
-INLINE PyObject *DtoolInstance_RichComparePointers(PyObject *v1, PyObject *v2, int op) {
-  int cmpval = DtoolInstance_ComparePointers(v1, v2);
-  Py_RETURN_RICHCOMPARE(cmpval, 0, op);
-}
-
-/**
- * Utility function for assigning a PyObject pointer while managing refcounts.
- */
-ALWAYS_INLINE void
-Dtool_Assign_PyObject(PyObject *&ptr, PyObject *value) {
-  PyObject *prev_value = ptr;
-  if (prev_value != value) {
-    ptr = Py_XNewRef(value);
-    Py_XDECREF(prev_value);
-  }
-}
-
-/**
- * Converts the enum value to a C long.
- */
-INLINE long Dtool_EnumValue_AsLong(PyObject *value) {
-  PyObject *val = PyObject_GetAttrString(value, "value");
-  if (val != nullptr) {
-    long as_long = PyLongOrInt_AS_LONG(val);
-    Py_DECREF(val);
-    return as_long;
-  } else {
-    return -1;
-  }
-}
-
 /**
  * These functions wrap a pointer for a class that defines get_type_handle().
  */
@@ -167,23 +110,6 @@ DTool_PyInit_Finalize(PyObject *self, void *local_this, Dtool_PyTypedObject *typ
   return 0;
 }
 
-/**
- * Checks that the tuple is empty.
- */
-ALWAYS_INLINE bool
-Dtool_CheckNoArgs(PyObject *args) {
-  return PyTuple_GET_SIZE(args) == 0;
-}
-
-/**
- * Checks that the tuple is empty, and that the dict is empty or NULL.
- */
-ALWAYS_INLINE bool
-Dtool_CheckNoArgs(PyObject *args, PyObject *kwds) {
-  return PyTuple_GET_SIZE(args) == 0 &&
-    (kwds == nullptr || PyDict_GET_SIZE(kwds) == 0);
-}
-
 /**
  * The following functions wrap an arbitrary C++ value into a PyObject.
  */
@@ -324,7 +250,8 @@ ALWAYS_INLINE PyObject *Dtool_WrapValue(PyObject *value) {
   return value;
 }
 
-ALWAYS_INLINE PyObject *Dtool_WrapValue(const vector_uchar &value) {
+template<class Allocator>
+ALWAYS_INLINE PyObject *Dtool_WrapValue(const std::vector<unsigned char, Allocator> &value) {
 #if PY_MAJOR_VERSION >= 3
   return PyBytes_FromStringAndSize((char *)value.data(), (Py_ssize_t)value.size());
 #else