mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-28 05:34:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

The silencing of DeprecationWarning was not taking -3 into consideration. Since

Browse source 
Py3K warnings are DeprecationWarning by default this was causing -3 to
essentially be a no-op. Now DeprecationWarning is only silenced if -3 is not
used.

Closes issue #7700. Thanks Ezio Melotti and Florent Xicluna for patch help.
This commit is contained in:
Brett Cannon 2010-01-14 20:00:28 +00:00
parent efdddd3370
commit 3ffa43db48
3 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Python/_warnings.c
View file

@ -839,31 +839,37 @@ create_filter(PyObject *category, const char *action)
static PyObject *
init_filters(void)
{
PyObject *filters = PyList_New(4);
// Don't silence DeprecationWarning if -3 was used.
PyObject *filters = PyList_New(Py_Py3kWarningFlag ? 3 : 4);
unsigned int pos = 0; // Post-incremented in each use.
unsigned int x;
const char *bytes_action;
if (filters == NULL)
return NULL;
PyList_SET_ITEM(filters, 0,
create_filter(PyExc_DeprecationWarning, "ignore"));
PyList_SET_ITEM(filters, 1,
if (!Py_Py3kWarningFlag) {
PyList_SET_ITEM(filters, pos++,
create_filter(PyExc_DeprecationWarning, "ignore"));
}
PyList_SET_ITEM(filters, pos++,
create_filter(PyExc_PendingDeprecationWarning, "ignore"));
PyList_SET_ITEM(filters, 2, create_filter(PyExc_ImportWarning, "ignore"));
PyList_SET_ITEM(filters, pos++,
create_filter(PyExc_ImportWarning, "ignore"));
if (Py_BytesWarningFlag > 1)
bytes_action = "error";
else if (Py_BytesWarningFlag)
bytes_action = "default";
else
bytes_action = "ignore";
PyList_SET_ITEM(filters, 3, create_filter(PyExc_BytesWarning,
PyList_SET_ITEM(filters, pos++, create_filter(PyExc_BytesWarning,
bytes_action));
if (PyList_GET_ITEM(filters, 0) == NULL ||
PyList_GET_ITEM(filters, 1) == NULL ||
PyList_GET_ITEM(filters, 2) == NULL ||
PyList_GET_ITEM(filters, 3) == NULL) {
Py_DECREF(filters);
return NULL;
for (x = 0; x < pos; x += 1) {
if (PyList_GET_ITEM(filters, x) == NULL) {
Py_DECREF(filters);
return NULL;
}
}
return filters;