In setup_context, replace _PyDict_GetItemWithError with PyDict_GetItemRef

erlend-aasland · erlend-aasland · commit 89e6f14fec22 · 2024-03-13T22:48:49.000+01:00
diff --git a/Python/_warnings.c b/Python/_warnings.c
@@ -933,18 +933,18 @@ setup_context(Py_ssize_t stack_level,
     }
 
     /* Setup module. */
-    *module = _PyDict_GetItemWithError(globals, &_Py_ID(__name__));
-    if (*module == Py_None || (*module != NULL && PyUnicode_Check(*module))) {
-        Py_INCREF(*module);
-    }
-    else if (_PyErr_Occurred(tstate)) {
+    rc = PyDict_GetItemRef(globals, &_Py_ID(__name__), module);
+    if (rc < 0) {
         goto handle_error;
     }
-    else {
+    if (rc == 0) {
         *module = PyUnicode_FromString("<string>");
         if (*module == NULL)
             goto handle_error;
     }
+    else {
+        assert(Py_IsNone(*module) || PyUnicode_Check(*module));
+    }
 
     return 1;
 
