Keep using _PyObject_HasAttrId when python version is too old

We could potentionally already use _PyObject_LookupAttrId starting with
python 3.7 instead of 3.10. I'm not sure if we should switch as soon or
as late as possible.

Alternatively we could also try backporting _PyObject_LookupAttrId to
<3.7.

Author: freundTech

mypyc/lib-rt/dict_ops.c

@@ -112,16 +112,10 @@ int CPyDict_Update(PyObject *dict, PyObject *stuff) {
 }
 
 int CPyDict_UpdateFromAny(PyObject *dict, PyObject *stuff) {
-    PyObject *tmp;
-
     if (PyDict_CheckExact(dict)) {
         // Argh this sucks
         _Py_IDENTIFIER(keys);
-        int hasAttr = PyDict_Check(stuff) || _PyObject_LookupAttrId(stuff, &PyId_keys, &tmp);
-        if (tmp) {
-            Py_DECREF(tmp);
-        }
-        if (hasAttr) {
+        if (PyDict_Check(stuff) || _CPyObject_HasAttrId(stuff, &PyId_keys)) {
             return PyDict_Update(dict, stuff);
         } else {
             return PyDict_MergeFromSeq2(dict, stuff, 1);
@@ -132,8 +126,6 @@ int CPyDict_UpdateFromAny(PyObject *dict, PyObject *stuff) {
 }
 
 PyObject *CPyDict_FromAny(PyObject *obj) {
-    PyObject *tmp;
-
     if (PyDict_Check(obj)) {
         return PyDict_Copy(obj);
     } else {
@@ -143,14 +135,11 @@ PyObject *CPyDict_FromAny(PyObject *obj) {
             return NULL;
         }
         _Py_IDENTIFIER(keys);
-        if (_PyObject_LookupAttrId(obj, &PyId_keys, &tmp)) {
+        if (_CPyObject_HasAttrId(obj, &PyId_keys)) {
             res = PyDict_Update(dict, obj);
         } else {
             res = PyDict_MergeFromSeq2(dict, obj, 1);
         }
-        if (tmp) {
-            Py_DECREF(tmp);
-        }
         if (res < 0) {
             Py_DECREF(dict);
             return NULL;

mypyc/lib-rt/pythonsupport.h

@@ -389,4 +389,18 @@ _CPyDictView_New(PyObject *dict, PyTypeObject *type)
 }
 #endif
 
+#if PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >=10
+static int
+_CPyObject_HasAttrId(PyObject *v, _Py_Identifier *name) {
+    PyObject *tmp = NULL;
+    int result = _PyObject_LookupAttrId(v, name, &tmp);
+    if (tmp) {
+        Py_DECREF(tmp);
+    }
+    return result;
+}
+#else
+#define _CPyObject_HasAttrId _PyObject_HasAttrId
+#endif
+
 #endif