refactor: move the _PyDictViewObject shim to the pyshim.hh header file

Xmader · Xmader · commit 07da1db421ef · 2024-09-20T04:50:21.000Z
diff --git a/include/JSObjectItemsProxy.hh b/include/JSObjectItemsProxy.hh
@@ -14,7 +14,7 @@
 #include <jsapi.h>
 
 #include <Python.h>
-#include "include/dictviewShim.hh"
+#include "include/pyshim.hh"
 
 
 /**
diff --git a/include/JSObjectKeysProxy.hh b/include/JSObjectKeysProxy.hh
@@ -14,7 +14,7 @@
 #include <jsapi.h>
 
 #include <Python.h>
-#include "include/dictviewShim.hh"
+#include "include/pyshim.hh"
 
 
 /**
diff --git a/include/JSObjectValuesProxy.hh b/include/JSObjectValuesProxy.hh
@@ -14,7 +14,7 @@
 #include <jsapi.h>
 
 #include <Python.h>
-#include "include/dictviewShim.hh"
+#include "include/pyshim.hh"
 
 
 /**
diff --git a/include/dictviewShim.hh b/include/dictviewShim.hh
diff --git a/include/pyshim.hh b/include/pyshim.hh
@@ -25,4 +25,15 @@
   #define Py_IsFinalizing _Py_IsFinalizing
 #endif
 
+/**
+ * @brief `_PyDictViewObject` type definition moved from Python's public API
+ *          to the **internal** header file `internal/pycore_dict.h` in Python 3.13.
+ *
+ * @see https://github.com/python/cpython/blob/v3.13.0rc1/Include/internal/pycore_dict.h#L64-L72
+ */
+typedef struct {
+  PyObject_HEAD
+  PyDictObject *dv_dict;
+} _PyDictViewObject;
+
 #endif // #ifndef PythonMonkey_py_version_shim_
diff --git a/src/JSObjectKeysProxy.cc b/src/JSObjectKeysProxy.cc
@@ -22,9 +22,7 @@
 #include <jsfriendapi.h>
 
 #include <Python.h>
-#include "include/dictviewShim.hh"
-
-
+#include "include/pyshim.hh"
 
 void JSObjectKeysProxyMethodDefinitions::JSObjectKeysProxy_dealloc(JSObjectKeysProxy *self)
 {
diff --git a/src/JSObjectProxy.cc b/src/JSObjectProxy.cc
@@ -27,7 +27,7 @@
 #include <jsfriendapi.h>
 
 #include <Python.h>
-#include "include/dictviewShim.hh"
+#include "include/pyshim.hh"
 
 #include <object.h>
 
diff --git a/src/JSObjectValuesProxy.cc b/src/JSObjectValuesProxy.cc
@@ -22,9 +22,7 @@
 #include <jsfriendapi.h>
 
 #include <Python.h>
-#include "include/dictviewShim.hh"
-
-
+#include "include/pyshim.hh"
 
 void JSObjectValuesProxyMethodDefinitions::JSObjectValuesProxy_dealloc(JSObjectValuesProxy *self)
 {

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,7 @@`
`22`	`22`	`#include <jsfriendapi.h>`
`23`	`23`
`24`	`24`	`#include <Python.h>`
`25`		`-#include "include/dictviewShim.hh"`
`26`		`-`
`27`		`-`
	`25`	`+#include "include/pyshim.hh"`
`28`	`26`
`29`	`27`	`void JSObjectKeysProxyMethodDefinitions::JSObjectKeysProxy_dealloc(JSObjectKeysProxy *self)`
`30`	`28`	`{`