summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2014-09-18 00:42:05 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2014-09-18 00:42:05 (GMT)
commit87538e7bc46885d2ad2cce423603b45d182d6d40 (patch)
tree732e291a58b2eeedab44f04d9b9f504a5960ae68 /Python
parent605a64b4360c552b20fc74d1ab51dd5bdd98e1ae (diff)
parentcb0a006fd11c06178a656cfdc6390b197b22fc67 (diff)
downloadcpython-87538e7bc46885d2ad2cce423603b45d182d6d40.zip
cpython-87538e7bc46885d2ad2cce423603b45d182d6d40.tar.gz
cpython-87538e7bc46885d2ad2cce423603b45d182d6d40.tar.bz2
Issue #4180: The warnings registries are now reset when the filters are modified.
Diffstat (limited to 'Python')
-rw-r--r--Python/_warnings.c41
1 files changed, 35 insertions, 6 deletions
diff --git a/Python/_warnings.c b/Python/_warnings.c
index 363c1f2..a1f4368 100644
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -12,6 +12,7 @@ MODULE_NAME " provides basic warning filtering support.\n"
static PyObject *_filters; /* List */
static PyObject *_once_registry; /* Dict */
static PyObject *_default_action; /* String */
+static long _filters_version;
_Py_IDENTIFIER(argv);
_Py_IDENTIFIER(stderr);
@@ -178,16 +179,33 @@ get_filter(PyObject *category, PyObject *text, Py_ssize_t lineno,
static int
already_warned(PyObject *registry, PyObject *key, int should_set)
{
- PyObject *already_warned;
+ PyObject *version_obj, *already_warned;
+ _Py_IDENTIFIER(version);
if (key == NULL)
return -1;
- already_warned = PyDict_GetItem(registry, key);
- if (already_warned != NULL) {
- int rc = PyObject_IsTrue(already_warned);
- if (rc != 0)
- return rc;
+ version_obj = _PyDict_GetItemId(registry, &PyId_version);
+ if (version_obj == NULL
+ || !PyLong_CheckExact(version_obj)
+ || PyLong_AsLong(version_obj) != _filters_version) {
+ PyDict_Clear(registry);
+ version_obj = PyLong_FromLong(_filters_version);
+ if (version_obj == NULL)
+ return -1;
+ if (_PyDict_SetItemId(registry, &PyId_version, version_obj) < 0) {
+ Py_DECREF(version_obj);
+ return -1;
+ }
+ Py_DECREF(version_obj);
+ }
+ else {
+ already_warned = PyDict_GetItem(registry, key);
+ if (already_warned != NULL) {
+ int rc = PyObject_IsTrue(already_warned);
+ if (rc != 0)
+ return rc;
+ }
}
/* This warning wasn't found in the registry, set it. */
@@ -751,6 +769,13 @@ warnings_warn_explicit(PyObject *self, PyObject *args, PyObject *kwds)
registry, NULL);
}
+static PyObject *
+warnings_filters_mutated(PyObject *self, PyObject *args)
+{
+ _filters_version++;
+ Py_RETURN_NONE;
+}
+
/* Function to issue a warning message; may raise an exception. */
@@ -918,6 +943,8 @@ static PyMethodDef warnings_functions[] = {
warn_doc},
{"warn_explicit", (PyCFunction)warnings_warn_explicit,
METH_VARARGS | METH_KEYWORDS, warn_explicit_doc},
+ {"_filters_mutated", (PyCFunction)warnings_filters_mutated, METH_NOARGS,
+ NULL},
/* XXX(brett.cannon): add showwarning? */
/* XXX(brett.cannon): Reasonable to add formatwarning? */
{NULL, NULL} /* sentinel */
@@ -1070,5 +1097,7 @@ _PyWarnings_Init(void)
Py_INCREF(_default_action);
if (PyModule_AddObject(m, "_defaultaction", _default_action) < 0)
return NULL;
+
+ _filters_version = 0;
return m;
}