diff options
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/_warnings.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Python/_warnings.c b/Python/_warnings.c index 27f5b81..2937036 100644 --- a/Python/_warnings.c +++ b/Python/_warnings.c @@ -528,16 +528,21 @@ warn_explicit(PyObject *category, PyObject *message, goto cleanup; } + if (_PyUnicode_EqualToASCIIString(action, "ignore")) { + goto return_none; + } + /* Store in the registry that we've been here, *except* when the action is "always". */ rc = 0; if (!_PyUnicode_EqualToASCIIString(action, "always")) { if (registry != NULL && registry != Py_None && - PyDict_SetItem(registry, key, Py_True) < 0) + PyDict_SetItem(registry, key, Py_True) < 0) + { goto cleanup; - else if (_PyUnicode_EqualToASCIIString(action, "ignore")) - goto return_none; - else if (_PyUnicode_EqualToASCIIString(action, "once")) { + } + + if (_PyUnicode_EqualToASCIIString(action, "once")) { if (registry == NULL || registry == Py_None) { registry = get_once_registry(); if (registry == NULL) |