Merge pull request H-uru#289 from dpogue/python3.12-fixes

Python 3.12 warning fixes
dpogue · Jun 19, 2024 · 1568702 · 1568702
2 parents 1f56a8e + 739fc96
commit 1568702
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Python/PyPlasma.h b/Python/PyPlasma.h
@@ -576,6 +576,12 @@ template <> inline plKeyDef pyPlasma_get(PyObject* value) { return (plKeyDef)PyL
     #define _TP_VECTORCALL_PRINT
 #endif
 
+#if (PY_MAJOR_VERSION >= 4) || ((PY_MAJOR_VERSION == 3) && (PY_MINOR_VERSION >= 12))
+    #define _TP_WATCHED_INIT 0,
+#else
+    #define _TP_WATCHED_INIT
+#endif
+
 #define PY_PLASMA_TYPE(pyType, classname, doctext)                      \
     PyTypeObject py##pyType##_Type = {                                  \
         PyVarObject_HEAD_INIT(nullptr, 0)                               \
@@ -596,6 +602,7 @@ template <> inline plKeyDef pyPlasma_get(PyObject* value) { return (plKeyDef)PyL
         nullptr, 0,                                                     \
         _TP_FINALIZE_INIT                                               \
         _TP_VECTORCALL_PRINT                                            \
+        _TP_WATCHED_INIT                                                \
     };
 
 #if ((PY_MAJOR_VERSION > 3) || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 5))

diff --git a/Python/ResManager/pyResManager.cpp b/Python/ResManager/pyResManager.cpp
@@ -28,7 +28,7 @@ PY_PLASMA_DEALLOC(ResManager)
 
 PY_PLASMA_INIT_DECL(ResManager)
 {
-    char* kwdlist[] = { "version", "preserveObjIDs", nullptr };
+    char* kwdlist[] = { _pycs("version"), _pycs("preserveObjIDs"), nullptr };
 
     int version = PlasmaVer::pvUnknown;
     bool preserveObjIDs = false;