Merge remote-tracking branch 'upstream/main' into bpo-29672-catch-war…

…nings-registries-restore
python · segevfiner · Jul 10, 2018 · Dec 1, 2018 · Feb 21, 2022 · Feb 21, 2022
commit c08c7015ae33ae8d55a3c335faef673882e59193
diff --git a/Python/_warnings.c b/Python/_warnings.c
@@ -393,40 +393,8 @@ get_filter(PyInterpreterState *interp, PyObject *category,
 
 
 static int
-call_registrycleared(PyObject *registry)
-{
-    PyObject *_registrycleared, *res;
-    _Py_IDENTIFIER(_registrycleared);
-
-    _registrycleared = get_warnings_attr(&PyId__registrycleared, 0);
-    if (_registrycleared == NULL) {
-        if (PyErr_Occurred())
-            return -1;
-        return 0;
-    }
-
-    if (!PyCallable_Check(_registrycleared)) {
-        PyErr_SetString(PyExc_TypeError,
-                "warnings._registrycleared() must be set to a callable");
-        goto error;
-    }
-
-    res = PyObject_CallFunctionObjArgs(_registrycleared, registry, NULL);
-    Py_DECREF(_registrycleared);
-
-    if (res == NULL);
-        return -1;
-
-    Py_DECREF(res);
-    return 0;
-
-error:
-    Py_DECREF(_registrycleared);
-    return -1;
-}
-
-static int
-already_warned(PyObject *registry, PyObject *key, int should_set)
+already_warned(PyInterpreterState *interp, PyObject *registry, PyObject *key,
+               int should_set)
 {
     PyObject *version_obj, *already_warned;
 
@@ -440,7 +408,11 @@ already_warned(PyObject *registry, PyObject *key, int should_set)
     version_obj = _PyDict_GetItemWithError(registry, &_Py_ID(version));
     if (version_obj == NULL
         || !PyLong_CheckExact(version_obj)
-        || PyLong_AsLong(version_obj) != _PyRuntime.warnings.filters_version) {
+        || PyLong_AsLong(version_obj) != st->filters_version)
+    {
+        if (PyErr_Occurred()) {
+            return -1;
+        }
         call_registrycleared(registry);
         PyDict_Clear(registry);
         version_obj = PyLong_FromLong(st->filters_version);
@@ -1128,19 +1100,36 @@ warnings_warn_explicit(PyObject *self, PyObject *args, PyObject *kwds)
 static PyObject *
 warnings_filters_mutated(PyObject *self, PyObject *args)
 {
-    return PyLong_FromLong(_PyRuntime.warnings.filters_version++);
+    PyInterpreterState *interp = get_current_interp();
+    if (interp == NULL) {
+        return NULL;
+    }
+    WarningsState *st = warnings_get_state(interp);
+    if (st == NULL) {
+        return NULL;
+    }
+    st->filters_version++;
+    Py_RETURN_NONE;
 }
 
 static PyObject *
 warnings_set_filters_version(PyObject *self, PyObject *args)
 {
     long filters_version;
 
-    if (!PyArg_ParseTuple(args, "l:_set_filters_version", &filters_version))
+    if (!PyArg_ParseTuple(args, "l:_set_filters_version", &filters_version)) {
         return NULL;
+    }
 
-    _PyRuntime.warnings.filters_version = filters_version;
-
+    PyInterpreterState *interp = get_current_interp();
+    if (interp == NULL) {
+        return NULL;
+    }
+    WarningsState *st = warnings_get_state(interp);
+    if (st == NULL) {
+        return NULL;
+    }
+    st->filters_version = filters_version;
     Py_RETURN_NONE;
 }