Variable rename

hauntsaninja · hauntsaninja · commit d47993176810 · 2024-01-06T00:20:10.000-08:00
diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
@@ -837,25 +837,25 @@ _Py_module_getattro_impl(PyModuleObject *m, PyObject *name, int suppress)
         Py_DECREF(mod_name);
         return NULL;
     }
+    int valid_origin = PyObject_GetOptionalAttr(spec, &_Py_ID(origin), &origin);
+    if (valid_origin == -1) {
+        Py_XDECREF(spec);
+        Py_DECREF(mod_name);
+        return NULL;
+    }
+    if (valid_origin == 1 && !PyUnicode_Check(origin)) {
+        valid_origin = 0;
+        Py_DECREF(origin);
+    }
+
     int rc = _PyModuleSpec_IsInitializing(spec);
     if (rc > 0) {
-        int valid_spec = PyObject_GetOptionalAttr(spec, &_Py_ID(origin), &origin);
-        if (valid_spec == -1) {
-            Py_XDECREF(spec);
-            Py_DECREF(mod_name);
-            return NULL;
-        }
-        if (valid_spec == 1 && !PyUnicode_Check(origin)) {
-            valid_spec = 0;
-            Py_DECREF(origin);
-        }
-        if (valid_spec == 1) {
+        if (valid_origin == 1) {
             PyErr_Format(PyExc_AttributeError,
                         "partially initialized "
                         "module '%U' from '%U' has no attribute '%U' "
                         "(most likely due to a circular import)",
                         mod_name, origin, name);
-            Py_DECREF(origin);
         }
         else {
             PyErr_Format(PyExc_AttributeError,
@@ -880,6 +880,7 @@ _Py_module_getattro_impl(PyModuleObject *m, PyObject *name, int suppress)
         }
     }
     Py_XDECREF(spec);
+    Py_XDECREF(origin);
     Py_DECREF(mod_name);
     return NULL;
 }
