Fix compilation with Python 3.13

Change-Id: I1f0b13d9a2136e8d691639eafef3bea99772c52b

Author: Paweł Andruszkiewicz

mysqlshdk/scripting/python_array_wrapper.cc

@@ -293,6 +293,10 @@ static PyTypeObject Array_object_type = {
     ,
     0  // tp_watched
 #endif
+#if PY_VERSION_HEX >= 0x030D0000
+    ,
+    0  // tp_versions_used
+#endif
 };
 
 #if PY_VERSION_HEX >= 0x03080000 && PY_VERSION_HEX < 0x03090000
@@ -462,6 +466,10 @@ static PyTypeObject Array_object_iterator_type = {
     ,
     0  // tp_watched
 #endif
+#if PY_VERSION_HEX >= 0x030D0000
+    ,
+    0  // tp_versions_used
+#endif
 };
 
 #if PY_VERSION_HEX >= 0x03080000 && PY_VERSION_HEX < 0x03090000
@@ -614,6 +622,10 @@ static PyTypeObject Array_object_reverse_iterator_type = {
     ,
     0  // tp_watched
 #endif
+#if PY_VERSION_HEX >= 0x030D0000
+    ,
+    0  // tp_versions_used
+#endif
 };
 
 #if PY_VERSION_HEX >= 0x03080000 && PY_VERSION_HEX < 0x03090000
@@ -1540,7 +1552,25 @@ int ao_init(Array_object *self, PyObject *args, PyObject *kw) {
     return -1;
   }
 
-  if (!_PyArg_NoKeywords("List", kw)) {
+  static constexpr auto expect_no_keywords = [](PyObject *kwargs) {
+    if (!kwargs) {
+      return true;
+    }
+
+    if (!PyDict_CheckExact(kwargs)) {
+      PyErr_BadInternalCall();
+      return false;
+    }
+
+    if (0 == PyDict_GET_SIZE(kwargs)) {
+      return true;
+    }
+
+    PyErr_SetString(PyExc_TypeError, "List() takes no keyword arguments");
+    return false;
+  };
+
+  if (!expect_no_keywords(kw)) {
     return -1;
   }
 

mysqlshdk/scripting/python_function_wrapper.cc

@@ -197,6 +197,10 @@ PyTypeObject PyShFuncObjectType = {
     ,
     0  // tp_watched
 #endif
+#if PY_VERSION_HEX >= 0x030D0000
+    ,
+    0  // tp_versions_used
+#endif
 };
 
 #if PY_VERSION_HEX >= 0x03080000 && PY_VERSION_HEX < 0x03090000

mysqlshdk/scripting/python_map_wrapper.cc

@@ -72,8 +72,10 @@ using Reverse_iterator = Iterator_base<Map_reverse_iterator>;
 ////////////////////////////////////////////////////////////////////////////////
 
 struct View {
-  _PyDictViewObject base;
+  // clang-format off
+  PyObject_HEAD
   py::Store o;
+  // clang-format on
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -380,6 +382,10 @@ PyTypeObject Type = {
     ,
     0  // tp_watched
 #endif
+#if PY_VERSION_HEX >= 0x030D0000
+    ,
+    0  // tp_versions_used
+#endif
 };
 
 #if PY_VERSION_HEX >= 0x03080000 && PY_VERSION_HEX < 0x03090000
@@ -866,6 +872,10 @@ PyTypeObject Type = {
     ,
     0  // tp_watched
 #endif
+#if PY_VERSION_HEX >= 0x030D0000
+    ,
+    0  // tp_versions_used
+#endif
 };
 
 #if PY_VERSION_HEX >= 0x03080000 && PY_VERSION_HEX < 0x03090000
@@ -1059,6 +1069,10 @@ PyTypeObject Type = {
     ,
     0  // tp_watched
 #endif
+#if PY_VERSION_HEX >= 0x030D0000
+    ,
+    0  // tp_versions_used
+#endif
 };
 
 #if PY_VERSION_HEX >= 0x03080000 && PY_VERSION_HEX < 0x03090000
@@ -1255,6 +1269,10 @@ PyTypeObject Type = {
     ,
     0  // tp_watched
 #endif
+#if PY_VERSION_HEX >= 0x030D0000
+    ,
+    0  // tp_versions_used
+#endif
 };
 
 #if PY_VERSION_HEX >= 0x03080000 && PY_VERSION_HEX < 0x03090000

mysqlshdk/scripting/python_object_wrapper.cc

@@ -288,6 +288,10 @@ PyTypeObject PyShMethodObjectType = {
     ,
     0  // tp_watched
 #endif
+#if PY_VERSION_HEX >= 0x030D0000
+    ,
+    0  // tp_versions_used
+#endif
 };
 
 #if PY_VERSION_HEX >= 0x03080000 && PY_VERSION_HEX < 0x03090000
@@ -732,6 +736,10 @@ PyTypeObject PyShObjObjectType = {
     ,
     0  // tp_watched
 #endif
+#if PY_VERSION_HEX >= 0x030D0000
+    ,
+    0  // tp_versions_used
+#endif
 };
 
 PyTypeObject PyShObjIndexedObjectType = {
@@ -831,6 +839,10 @@ PyTypeObject PyShObjIndexedObjectType = {
     ,
     0  // tp_watched
 #endif
+#if PY_VERSION_HEX >= 0x030D0000
+    ,
+    0  // tp_versions_used
+#endif
 };
 
 #if PY_VERSION_HEX >= 0x03080000 && PY_VERSION_HEX < 0x03090000

unittest/scripts/auto/py_shell/scripts/dict_norecord.py

@@ -660,7 +660,7 @@ def assign_none_to_mapping():
 
 #@<> __subclasshook__
 # __subclasshook__ comes from the object class
-EXPECT_EQ(NotImplemented, shdict.__subclasshook__())
+EXPECT_EQ(NotImplemented, shdict.__subclasshook__(None))
 
 #@<> clear
 SETUP("clear")
@@ -1345,7 +1345,7 @@ def assign_none_to_mapping():
 #@<> items - __subclasshook__
 SETUP_VIEW("items", "__subclasshook__")
 # __subclasshook__ comes from the object class
-EXPECT_EQ(NotImplemented, actual.__class__.__subclasshook__())
+EXPECT_EQ(NotImplemented, actual.__class__.__subclasshook__(None))
 
 #@<> items - __xor__
 SETUP_VIEW("items", "__xor__")
@@ -2005,7 +2005,7 @@ def assign_none_to_mapping():
 #@<> keys - __subclasshook__
 SETUP_VIEW("keys", "__subclasshook__")
 # __subclasshook__ comes from the object class
-EXPECT_EQ(NotImplemented, actual.__class__.__subclasshook__())
+EXPECT_EQ(NotImplemented, actual.__class__.__subclasshook__(None))
 
 #@<> keys - __xor__
 SETUP_VIEW("keys", "__xor__")
@@ -2481,7 +2481,7 @@ def assign_none_to_mapping():
 #@<> values - __subclasshook__
 SETUP_VIEW("values", "__subclasshook__")
 # __subclasshook__ comes from the object class
-EXPECT_EQ(NotImplemented, actual.__class__.__subclasshook__())
+EXPECT_EQ(NotImplemented, actual.__class__.__subclasshook__(None))
 
 #@<> values - mapping {sys.hexversion >= 0x030A0000}
 SETUP_VIEW("values", "mapping")

unittest/scripts/auto/py_shell/scripts/list_norecord.py

@@ -693,8 +693,9 @@ def TEST_OP_LIST_ARG(*args, **kwargs):
 SETUP("__setitem__", range(11))
 
 ## exceptions
-# can only assign an iterable
-TEST(slice(2, 7), 7)
+# can only assign an iterable, Python 3.13+ reports must assign iterable to extended slice instead
+if sys.hexversion < 0x030d0000:
+    TEST(slice(2, 7), 7)
 # must assign iterable to extended slice
 TEST(slice(2, 7, 2), 7)
 # attempt to assign sequence of size %zd to extended slice of size %zd
@@ -750,7 +751,7 @@ def TEST_OP_LIST_ARG(*args, **kwargs):
 
 #@<> __subclasshook__
 # __subclasshook__ comes from the object class
-EXPECT_EQ(NotImplemented, shlist.__subclasshook__())
+EXPECT_EQ(NotImplemented, shlist.__subclasshook__(None))
 
 #@<> append
 SETUP("append")