bpo-31411: Prevent raising a SystemError in case warnings.onceregistry is not a dictionary. (#3485)
This commit is contained in:
parent
3866d9bbcf
commit
252033d50e
|
@ -794,6 +794,17 @@ class _WarningsTests(BaseTest, unittest.TestCase):
|
|||
self.assertNotIn(b'Warning!', stderr)
|
||||
self.assertNotIn(b'Error', stderr)
|
||||
|
||||
@support.cpython_only
|
||||
def test_issue31411(self):
|
||||
# warn_explicit() shouldn't raise a SystemError in case
|
||||
# warnings.onceregistry isn't a dictionary.
|
||||
wmod = self.module
|
||||
with original_warnings.catch_warnings(module=wmod):
|
||||
wmod.filterwarnings('once')
|
||||
with support.swap_attr(wmod, 'onceregistry', None):
|
||||
with self.assertRaises(TypeError):
|
||||
wmod.warn_explicit('foo', Warning, 'bar', 1, registry=None)
|
||||
|
||||
|
||||
class WarningsDisplayTests(BaseTest):
|
||||
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
Raise a TypeError instead of SystemError in case warnings.onceregistry is
|
||||
not a dictionary. Patch by Oren Milman.
|
|
@ -86,6 +86,12 @@ get_once_registry(void)
|
|||
return NULL;
|
||||
return _PyRuntime.warnings.once_registry;
|
||||
}
|
||||
if (!PyDict_Check(registry)) {
|
||||
PyErr_SetString(PyExc_TypeError,
|
||||
"warnings.onceregistry must be a dict");
|
||||
Py_DECREF(registry);
|
||||
return NULL;
|
||||
}
|
||||
Py_DECREF(_PyRuntime.warnings.once_registry);
|
||||
_PyRuntime.warnings.once_registry = registry;
|
||||
return registry;
|
||||
|
@ -437,7 +443,7 @@ warn_explicit(PyObject *category, PyObject *message,
|
|||
Py_RETURN_NONE;
|
||||
|
||||
if (registry && !PyDict_Check(registry) && (registry != Py_None)) {
|
||||
PyErr_SetString(PyExc_TypeError, "'registry' must be a dict");
|
||||
PyErr_SetString(PyExc_TypeError, "'registry' must be a dict or None");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue