Nuitka-winsvc 2.3.9__cp311-cp311-win_amd64.whl → 2.4.1__cp311-cp311-win_amd64.whl

nuitka/build/static_src/CompiledGeneratorTypeUncompiledIntegration.c

@@ -278,7 +278,7 @@ static PyObject *Nuitka_PyGen_Send(PyThreadState *tstate, PyGenObject *gen, PyOb
 #endif
 
         // Now release frame.
-#if PYTHON_VERSION >= 0x340
+#if PYTHON_VERSION >= 0x300
         gen->gi_frame->f_gen = NULL;
 #endif
         gen->gi_frame = NULL;
@@ -331,7 +331,7 @@ static PyObject *Nuitka_PyGen_Send(PyThreadState *tstate, PyGenObject *gen, PyOb
 // Not done for earlier versions yet, indicate usability for compiled
 // generators, but it seems that mostly coroutines need it anyway, so the
 // benefit would be only for performance and not by a lot.
-#if PYTHON_VERSION >= 0x340 && PYTHON_VERSION < 0x3d0
+#if PYTHON_VERSION >= 0x300 && PYTHON_VERSION < 0x3d0
 #define NUITKA_UNCOMPILED_THROW_INTEGRATION 1
 #endif
 

nuitka/build/static_src/CompiledMethodType.c

@@ -243,16 +243,17 @@ static PyObject *Nuitka_Method_tp_call(struct Nuitka_MethodObject *method, PyObj
     }
 }
 
-static PyObject *Nuitka_Method_tp_descr_get(struct Nuitka_MethodObject *method, PyObject *object, PyObject *klass) {
+static PyObject *Nuitka_Method_tp_descr_get(struct Nuitka_MethodObject *method, PyObject *object,
+                                            PyObject *class_object) {
     // Don't rebind already bound methods.
     if (method->m_object != NULL) {
         Py_INCREF(method);
         return (PyObject *)method;
     }
 
-    if (method->m_class != NULL && klass != NULL) {
+    if (method->m_class != NULL && class_object != NULL) {
         // Quick subclass test, bound methods remain the same if the class is a sub class
-        int result = PyObject_IsSubclass(klass, method->m_class);
+        int result = PyObject_IsSubclass(class_object, method->m_class);
 
         if (unlikely(result < 0)) {
             return NULL;
@@ -262,7 +263,7 @@ static PyObject *Nuitka_Method_tp_descr_get(struct Nuitka_MethodObject *method,
         }
     }
 
-    return Nuitka_Method_New(method->m_function, object, klass);
+    return Nuitka_Method_New(method->m_function, object, class_object);
 }
 
 static PyObject *Nuitka_Method_tp_getattro(struct Nuitka_MethodObject *method, PyObject *name) {
@@ -446,13 +447,13 @@ static void Nuitka_Method_tp_dealloc(struct Nuitka_MethodObject *method) {
 static PyObject *Nuitka_Method_tp_new(PyTypeObject *type, PyObject *args, PyObject *kw) {
     PyObject *func;
     PyObject *self;
-    PyObject *klass = NULL;
+    PyObject *class_object = NULL;
 
     if (!_PyArg_NoKeywords("compiled_method", kw)) {
         return NULL;
     }
 
-    if (!PyArg_UnpackTuple(args, "compiled_method", 2, 3, &func, &self, &klass)) {
+    if (!PyArg_UnpackTuple(args, "compiled_method", 2, 3, &func, &self, &class_object)) {
         return NULL;
     }
 
@@ -469,7 +470,7 @@ static PyObject *Nuitka_Method_tp_new(PyTypeObject *type, PyObject *args, PyObje
         self = NULL;
     }
 
-    if (self == NULL && klass == NULL) {
+    if (self == NULL && class_object == NULL) {
         PyThreadState *tstate = PyThreadState_GET();
 
         SET_CURRENT_EXCEPTION_TYPE0_STR(tstate, PyExc_TypeError, "unbound methods must have non-NULL im_class");
@@ -477,7 +478,7 @@ static PyObject *Nuitka_Method_tp_new(PyTypeObject *type, PyObject *args, PyObje
     }
 
     if (Nuitka_Method_Check(func)) {
-        return Nuitka_Method_New(((struct Nuitka_MethodObject *)func)->m_function, self, klass);
+        return Nuitka_Method_New(((struct Nuitka_MethodObject *)func)->m_function, self, class_object);
     }
 
     if (Nuitka_Function_Check(func) == false) {
@@ -485,7 +486,7 @@ static PyObject *Nuitka_Method_tp_new(PyTypeObject *type, PyObject *args, PyObje
         return NULL;
     }
 
-    return Nuitka_Method_New((struct Nuitka_FunctionObject *)func, self, klass);
+    return Nuitka_Method_New((struct Nuitka_FunctionObject *)func, self, class_object);
 }
 
 PyTypeObject Nuitka_Method_Type = {
@@ -550,7 +551,7 @@ PyTypeObject Nuitka_Method_Type = {
     0,                                                // tp_weaklist
     0,                                                // tp_del
     0                                                 // tp_version_tag
-#if PYTHON_VERSION >= 0x340
+#if PYTHON_VERSION >= 0x300
     ,
     0 /* tp_finalizer */
 #endif
@@ -560,7 +561,7 @@ void _initCompiledMethodType(void) {
     Nuitka_PyType_Ready(&Nuitka_Method_Type, &PyMethod_Type, false, true, false, false, false);
 }
 
-PyObject *Nuitka_Method_New(struct Nuitka_FunctionObject *function, PyObject *object, PyObject *klass) {
+PyObject *Nuitka_Method_New(struct Nuitka_FunctionObject *function, PyObject *object, PyObject *class_object) {
     struct Nuitka_MethodObject *result;
 
     CHECK_OBJECT((PyObject *)function);
@@ -580,8 +581,8 @@ PyObject *Nuitka_Method_New(struct Nuitka_FunctionObject *function, PyObject *ob
 
     result->m_object = object;
     Py_XINCREF(object);
-    result->m_class = klass;
-    Py_XINCREF(klass);
+    result->m_class = class_object;
+    Py_XINCREF(class_object);
 
     result->m_weakrefs = NULL;
 

nuitka/build/static_src/HelpersAttributes.c

@@ -6,25 +6,23 @@
 #include "nuitka/prelude.h"
 #endif
 
-// spell-checker: ignore klass
-
 #if PYTHON_VERSION < 0x300
-PyObject *FIND_ATTRIBUTE_IN_CLASS(PyClassObject *klass, PyObject *attr_name) {
-    CHECK_OBJECT(klass);
+PyObject *FIND_ATTRIBUTE_IN_CLASS(PyClassObject *class_object, PyObject *attr_name) {
+    CHECK_OBJECT(class_object);
     CHECK_OBJECT(attr_name);
 
-    assert(PyClass_Check(klass));
+    assert(PyClass_Check(class_object));
     assert(PyString_CheckExact(attr_name));
 
-    PyObject *result = GET_STRING_DICT_VALUE((PyDictObject *)klass->cl_dict, (PyStringObject *)attr_name);
+    PyObject *result = GET_STRING_DICT_VALUE((PyDictObject *)class_object->cl_dict, (PyStringObject *)attr_name);
 
     if (result == NULL) {
-        assert(PyTuple_Check(klass->cl_bases));
+        assert(PyTuple_Check(class_object->cl_bases));
 
-        Py_ssize_t base_count = PyTuple_GET_SIZE(klass->cl_bases);
+        Py_ssize_t base_count = PyTuple_GET_SIZE(class_object->cl_bases);
 
         for (Py_ssize_t i = 0; i < base_count; i++) {
-            result = FIND_ATTRIBUTE_IN_CLASS((PyClassObject *)PyTuple_GET_ITEM(klass->cl_bases, i), attr_name);
+            result = FIND_ATTRIBUTE_IN_CLASS((PyClassObject *)PyTuple_GET_ITEM(class_object->cl_bases, i), attr_name);
 
             if (result != NULL) {
                 break;
@@ -124,7 +122,7 @@ PyObject *LOOKUP_ATTRIBUTE(PyThreadState *tstate, PyObject *source, PyObject *at
             if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
                 func = Py_TYPE(descr)->tp_descr_get;
 
-                if (func != NULL && PyDescr_IsData(descr)) {
+                if (func != NULL && Nuitka_Descr_IsData(descr)) {
                     PyObject *result = func(descr, source, (PyObject *)type);
                     Py_DECREF(descr);
 
@@ -276,7 +274,7 @@ PyObject *LOOKUP_ATTRIBUTE_DICT_SLOT(PyThreadState *tstate, PyObject *source) {
             if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
                 func = Py_TYPE(descr)->tp_descr_get;
 
-                if (func != NULL && PyDescr_IsData(descr)) {
+                if (func != NULL && Nuitka_Descr_IsData(descr)) {
                     PyObject *result = func(descr, source, (PyObject *)type);
                     Py_DECREF(descr);
 
@@ -393,7 +391,7 @@ PyObject *LOOKUP_ATTRIBUTE_CLASS_SLOT(PyThreadState *tstate, PyObject *source) {
             if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
                 func = Py_TYPE(descr)->tp_descr_get;
 
-                if (func != NULL && PyDescr_IsData(descr)) {
+                if (func != NULL && Nuitka_Descr_IsData(descr)) {
                     PyObject *result = func(descr, source, (PyObject *)type);
                     Py_DECREF(descr);
 
@@ -558,7 +556,7 @@ bool HAS_ATTR_BOOL(PyThreadState *tstate, PyObject *source, PyObject *attr_name)
             if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
                 func = Py_TYPE(descr)->tp_descr_get;
 
-                if (func != NULL && PyDescr_IsData(descr)) {
+                if (func != NULL && Nuitka_Descr_IsData(descr)) {
                     PyObject *result = func(descr, source, (PyObject *)type);
                     Py_DECREF(descr);
 
@@ -727,7 +725,7 @@ int HAS_ATTR_BOOL2(PyThreadState *tstate, PyObject *source, PyObject *attr_name)
             if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
                 func = Py_TYPE(descr)->tp_descr_get;
 
-                if (func != NULL && PyDescr_IsData(descr)) {
+                if (func != NULL && Nuitka_Descr_IsData(descr)) {
                     PyObject *result = func(descr, source, (PyObject *)type);
                     Py_DECREF(descr);
 
@@ -929,7 +927,7 @@ static bool SET_ATTRIBUTE_GENERIC(PyThreadState *tstate, PyTypeObject *type, PyO
         if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
             descrsetfunc func = Py_TYPE(descr)->tp_descr_set;
 
-            if (func != NULL && PyDescr_IsData(descr)) {
+            if (func != NULL && Nuitka_Descr_IsData(descr)) {
                 int res = func(descr, target, value);
                 Py_DECREF(descr);
 

nuitka/build/static_src/HelpersBuiltin.c

@@ -165,10 +165,19 @@ PyObject *EVAL_CODE(PyThreadState *tstate, PyObject *code, PyObject *globals, Py
         return NULL;
     }
 
-    // Set the __builtins__ in globals, it is expected to be present.
-    if (PyDict_Check(globals) && DICT_HAS_ITEM(tstate, globals, const_str_plain___builtins__) == 0) {
-        if (PyDict_SetItem(globals, const_str_plain___builtins__, (PyObject *)builtin_module) != 0) {
-            return NULL;
+    // Set the "__builtins__" value in globals, it is expected to be present.
+    assert(builtin_module != NULL);
+
+    if (PyDict_Check(globals)) {
+        const int res = DICT_HAS_ITEM(tstate, globals, const_str_plain___builtins__);
+
+        if (res == 0) {
+            if (PyDict_SetItem(globals, const_str_plain___builtins__, (PyObject *)builtin_module) != 0) {
+                // Not really allowed to happen, so far this was seen only with
+                // C compilers getting the value of "res" wrong.
+                assert(false);
+                return NULL;
+            }
         }
     }
 
@@ -448,7 +457,7 @@ PyObject *BUILTIN_HASH(PyThreadState *tstate, PyObject *value) {
     }
 
 #if PYTHON_VERSION < 0x300
-    if (likely(type->tp_compare == NULL && RICHCOMPARE(type) == NULL)) {
+    if (likely(type->tp_compare == NULL && TP_RICHCOMPARE(type) == NULL)) {
         Py_hash_t hash = Nuitka_HashFromPointer(value);
         return PyInt_FromLong(hash);
     }
@@ -467,7 +476,7 @@ Py_hash_t HASH_VALUE_WITH_ERROR(PyThreadState *tstate, PyObject *value) {
     }
 
 #if PYTHON_VERSION < 0x300
-    if (likely(type->tp_compare == NULL && RICHCOMPARE(type) == NULL)) {
+    if (likely(type->tp_compare == NULL && TP_RICHCOMPARE(type) == NULL)) {
         return Nuitka_HashFromPointer(value);
     }
 #endif
@@ -490,7 +499,7 @@ Py_hash_t HASH_VALUE_WITHOUT_ERROR(PyThreadState *tstate, PyObject *value) {
     }
 
 #if PYTHON_VERSION < 0x300
-    if (likely(type->tp_compare == NULL && RICHCOMPARE(type) == NULL)) {
+    if (likely(type->tp_compare == NULL && TP_RICHCOMPARE(type) == NULL)) {
         return Nuitka_HashFromPointer(value);
     }
 #endif
@@ -619,9 +628,9 @@ PyObject *BUILTIN_TYPE3(PyThreadState *tstate, PyObject *module_name, PyObject *
     Py_DECREF(pos_args);
 
     if (HAS_ATTR_BOOL(tstate, result, const_str_plain___module__) == false) {
-        int res = SET_ATTRIBUTE(tstate, result, const_str_plain___module__, module_name);
+        bool b_res = SET_ATTRIBUTE(tstate, result, const_str_plain___module__, module_name);
 
-        if (res < 0) {
+        if (b_res == false) {
             Py_DECREF(result);
             return NULL;
         }

nuitka/build/static_src/HelpersCalling.c

@@ -287,39 +287,39 @@ char const *GET_CALLABLE_DESC(PyObject *object) {
     }
 }
 
-char const *GET_CLASS_NAME(PyObject *klass) {
-    if (klass == NULL) {
+char const *GET_CLASS_NAME(PyObject *class_object) {
+    if (class_object == NULL) {
         return "?";
     } else {
 #if PYTHON_VERSION < 0x300
-        if (PyClass_Check(klass)) {
-            return Nuitka_String_AsString(((PyClassObject *)klass)->cl_name);
+        if (PyClass_Check(class_object)) {
+            return Nuitka_String_AsString(((PyClassObject *)class_object)->cl_name);
         }
 #endif
 
-        if (!PyType_Check(klass)) {
-            klass = (PyObject *)Py_TYPE(klass);
+        if (!PyType_Check(class_object)) {
+            class_object = (PyObject *)Py_TYPE(class_object);
         }
 
-        return ((PyTypeObject *)klass)->tp_name;
+        return ((PyTypeObject *)class_object)->tp_name;
     }
 }
 
 char const *GET_INSTANCE_CLASS_NAME(PyThreadState *tstate, PyObject *instance) {
     // TODO: Why not use our own attribute lookup here.
-    PyObject *klass = PyObject_GetAttr(instance, const_str_plain___class__);
+    PyObject *class_object = PyObject_GetAttr(instance, const_str_plain___class__);
 
     // Fallback to type as this cannot fail.
-    if (klass == NULL) {
+    if (class_object == NULL) {
         CLEAR_ERROR_OCCURRED(tstate);
 
-        klass = (PyObject *)Py_TYPE(instance);
-        Py_INCREF(klass);
+        class_object = (PyObject *)Py_TYPE(instance);
+        Py_INCREF(class_object);
     }
 
-    char const *result = GET_CLASS_NAME(klass);
+    char const *result = GET_CLASS_NAME(class_object);
 
-    Py_DECREF(klass);
+    Py_DECREF(class_object);
 
     return result;
 }

nuitka/build/static_src/HelpersCallingGenerated.c

@@ -11903,7 +11903,7 @@ PyObject *CALL_METHOD_NO_ARGS(PyThreadState *tstate, PyObject *source, PyObject
             if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
                 func = Py_TYPE(descr)->tp_descr_get;
 
-                if (func != NULL && PyDescr_IsData(descr)) {
+                if (func != NULL && Nuitka_Descr_IsData(descr)) {
                     PyObject *called_object = func(descr, source, (PyObject *)type);
                     Py_DECREF(descr);
 
@@ -12069,7 +12069,7 @@ PyObject *CALL_METHOD_NO_ARGS(PyThreadState *tstate, PyObject *source, PyObject
         if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
             func = Py_TYPE(descr)->tp_descr_get;
 
-            if (func != NULL && PyDescr_IsData(descr)) {
+            if (func != NULL && Nuitka_Descr_IsData(descr)) {
                 PyObject *called_object = func(descr, source, (PyObject *)type);
                 Py_DECREF(descr);
 
@@ -12129,7 +12129,7 @@ PyObject *CALL_METHOD_WITH_SINGLE_ARG(PyThreadState *tstate, PyObject *source, P
             if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
                 func = Py_TYPE(descr)->tp_descr_get;
 
-                if (func != NULL && PyDescr_IsData(descr)) {
+                if (func != NULL && Nuitka_Descr_IsData(descr)) {
                     PyObject *called_object = func(descr, source, (PyObject *)type);
                     Py_DECREF(descr);
 
@@ -12295,7 +12295,7 @@ PyObject *CALL_METHOD_WITH_SINGLE_ARG(PyThreadState *tstate, PyObject *source, P
         if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
             func = Py_TYPE(descr)->tp_descr_get;
 
-            if (func != NULL && PyDescr_IsData(descr)) {
+            if (func != NULL && Nuitka_Descr_IsData(descr)) {
                 PyObject *called_object = func(descr, source, (PyObject *)type);
                 Py_DECREF(descr);
 
@@ -12354,7 +12354,7 @@ PyObject *CALL_METHOD_WITH_ARGS2(PyThreadState *tstate, PyObject *source, PyObje
             if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
                 func = Py_TYPE(descr)->tp_descr_get;
 
-                if (func != NULL && PyDescr_IsData(descr)) {
+                if (func != NULL && Nuitka_Descr_IsData(descr)) {
                     PyObject *called_object = func(descr, source, (PyObject *)type);
                     Py_DECREF(descr);
 
@@ -12520,7 +12520,7 @@ PyObject *CALL_METHOD_WITH_ARGS2(PyThreadState *tstate, PyObject *source, PyObje
         if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
             func = Py_TYPE(descr)->tp_descr_get;
 
-            if (func != NULL && PyDescr_IsData(descr)) {
+            if (func != NULL && Nuitka_Descr_IsData(descr)) {
                 PyObject *called_object = func(descr, source, (PyObject *)type);
                 Py_DECREF(descr);
 
@@ -12579,7 +12579,7 @@ PyObject *CALL_METHOD_WITH_ARGS3(PyThreadState *tstate, PyObject *source, PyObje
             if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
                 func = Py_TYPE(descr)->tp_descr_get;
 
-                if (func != NULL && PyDescr_IsData(descr)) {
+                if (func != NULL && Nuitka_Descr_IsData(descr)) {
                     PyObject *called_object = func(descr, source, (PyObject *)type);
                     Py_DECREF(descr);
 
@@ -12745,7 +12745,7 @@ PyObject *CALL_METHOD_WITH_ARGS3(PyThreadState *tstate, PyObject *source, PyObje
         if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
             func = Py_TYPE(descr)->tp_descr_get;
 
-            if (func != NULL && PyDescr_IsData(descr)) {
+            if (func != NULL && Nuitka_Descr_IsData(descr)) {
                 PyObject *called_object = func(descr, source, (PyObject *)type);
                 Py_DECREF(descr);
 
@@ -12804,7 +12804,7 @@ PyObject *CALL_METHOD_WITH_ARGS4(PyThreadState *tstate, PyObject *source, PyObje
             if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
                 func = Py_TYPE(descr)->tp_descr_get;
 
-                if (func != NULL && PyDescr_IsData(descr)) {
+                if (func != NULL && Nuitka_Descr_IsData(descr)) {
                     PyObject *called_object = func(descr, source, (PyObject *)type);
                     Py_DECREF(descr);
 
@@ -12970,7 +12970,7 @@ PyObject *CALL_METHOD_WITH_ARGS4(PyThreadState *tstate, PyObject *source, PyObje
         if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
             func = Py_TYPE(descr)->tp_descr_get;
 
-            if (func != NULL && PyDescr_IsData(descr)) {
+            if (func != NULL && Nuitka_Descr_IsData(descr)) {
                 PyObject *called_object = func(descr, source, (PyObject *)type);
                 Py_DECREF(descr);
 
@@ -13029,7 +13029,7 @@ PyObject *CALL_METHOD_WITH_ARGS5(PyThreadState *tstate, PyObject *source, PyObje
             if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
                 func = Py_TYPE(descr)->tp_descr_get;
 
-                if (func != NULL && PyDescr_IsData(descr)) {
+                if (func != NULL && Nuitka_Descr_IsData(descr)) {
                     PyObject *called_object = func(descr, source, (PyObject *)type);
                     Py_DECREF(descr);
 
@@ -13195,7 +13195,7 @@ PyObject *CALL_METHOD_WITH_ARGS5(PyThreadState *tstate, PyObject *source, PyObje
         if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
             func = Py_TYPE(descr)->tp_descr_get;
 
-            if (func != NULL && PyDescr_IsData(descr)) {
+            if (func != NULL && Nuitka_Descr_IsData(descr)) {
                 PyObject *called_object = func(descr, source, (PyObject *)type);
                 Py_DECREF(descr);
 
@@ -13254,7 +13254,7 @@ PyObject *CALL_METHOD_WITH_ARGS6(PyThreadState *tstate, PyObject *source, PyObje
             if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
                 func = Py_TYPE(descr)->tp_descr_get;
 
-                if (func != NULL && PyDescr_IsData(descr)) {
+                if (func != NULL && Nuitka_Descr_IsData(descr)) {
                     PyObject *called_object = func(descr, source, (PyObject *)type);
                     Py_DECREF(descr);
 
@@ -13420,7 +13420,7 @@ PyObject *CALL_METHOD_WITH_ARGS6(PyThreadState *tstate, PyObject *source, PyObje
         if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
             func = Py_TYPE(descr)->tp_descr_get;
 
-            if (func != NULL && PyDescr_IsData(descr)) {
+            if (func != NULL && Nuitka_Descr_IsData(descr)) {
                 PyObject *called_object = func(descr, source, (PyObject *)type);
                 Py_DECREF(descr);
 
@@ -13479,7 +13479,7 @@ PyObject *CALL_METHOD_WITH_ARGS7(PyThreadState *tstate, PyObject *source, PyObje
             if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
                 func = Py_TYPE(descr)->tp_descr_get;
 
-                if (func != NULL && PyDescr_IsData(descr)) {
+                if (func != NULL && Nuitka_Descr_IsData(descr)) {
                     PyObject *called_object = func(descr, source, (PyObject *)type);
                     Py_DECREF(descr);
 
@@ -13645,7 +13645,7 @@ PyObject *CALL_METHOD_WITH_ARGS7(PyThreadState *tstate, PyObject *source, PyObje
         if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
             func = Py_TYPE(descr)->tp_descr_get;
 
-            if (func != NULL && PyDescr_IsData(descr)) {
+            if (func != NULL && Nuitka_Descr_IsData(descr)) {
                 PyObject *called_object = func(descr, source, (PyObject *)type);
                 Py_DECREF(descr);
 
@@ -13704,7 +13704,7 @@ PyObject *CALL_METHOD_WITH_ARGS8(PyThreadState *tstate, PyObject *source, PyObje
             if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
                 func = Py_TYPE(descr)->tp_descr_get;
 
-                if (func != NULL && PyDescr_IsData(descr)) {
+                if (func != NULL && Nuitka_Descr_IsData(descr)) {
                     PyObject *called_object = func(descr, source, (PyObject *)type);
                     Py_DECREF(descr);
 
@@ -13870,7 +13870,7 @@ PyObject *CALL_METHOD_WITH_ARGS8(PyThreadState *tstate, PyObject *source, PyObje
         if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
             func = Py_TYPE(descr)->tp_descr_get;
 
-            if (func != NULL && PyDescr_IsData(descr)) {
+            if (func != NULL && Nuitka_Descr_IsData(descr)) {
                 PyObject *called_object = func(descr, source, (PyObject *)type);
                 Py_DECREF(descr);
 
@@ -13929,7 +13929,7 @@ PyObject *CALL_METHOD_WITH_ARGS9(PyThreadState *tstate, PyObject *source, PyObje
             if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
                 func = Py_TYPE(descr)->tp_descr_get;
 
-                if (func != NULL && PyDescr_IsData(descr)) {
+                if (func != NULL && Nuitka_Descr_IsData(descr)) {
                     PyObject *called_object = func(descr, source, (PyObject *)type);
                     Py_DECREF(descr);
 
@@ -14095,7 +14095,7 @@ PyObject *CALL_METHOD_WITH_ARGS9(PyThreadState *tstate, PyObject *source, PyObje
         if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
             func = Py_TYPE(descr)->tp_descr_get;
 
-            if (func != NULL && PyDescr_IsData(descr)) {
+            if (func != NULL && Nuitka_Descr_IsData(descr)) {
                 PyObject *called_object = func(descr, source, (PyObject *)type);
                 Py_DECREF(descr);
 
@@ -14154,7 +14154,7 @@ PyObject *CALL_METHOD_WITH_ARGS10(PyThreadState *tstate, PyObject *source, PyObj
             if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
                 func = Py_TYPE(descr)->tp_descr_get;
 
-                if (func != NULL && PyDescr_IsData(descr)) {
+                if (func != NULL && Nuitka_Descr_IsData(descr)) {
                     PyObject *called_object = func(descr, source, (PyObject *)type);
                     Py_DECREF(descr);
 
@@ -14320,7 +14320,7 @@ PyObject *CALL_METHOD_WITH_ARGS10(PyThreadState *tstate, PyObject *source, PyObj
         if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
             func = Py_TYPE(descr)->tp_descr_get;
 
-            if (func != NULL && PyDescr_IsData(descr)) {
+            if (func != NULL && Nuitka_Descr_IsData(descr)) {
                 PyObject *called_object = func(descr, source, (PyObject *)type);
                 Py_DECREF(descr);