Skip to content

bpo-27535: Cleanup create_filter() #4516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 2 commits into from
Nov 23, 2017
Merged

bpo-27535: Cleanup create_filter() #4516

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c7ffe5
bpo-27535: Cleanup create_filter()
vstinner Nov 23, 2017
c6e13e5
Replace x+=1 with x++
vstinner Nov 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 18 additions & 38 deletions Python/_warnings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ MODULE_NAME " provides basic warning filtering support.\n"

_Py_IDENTIFIER(argv);
_Py_IDENTIFIER(stderr);
_Py_IDENTIFIER(ignore);
_Py_IDENTIFIER(error);
_Py_IDENTIFIER(always);
_Py_static_string(PyId_default, "default");

static int
check_matched(PyObject *obj, PyObject *arg)
Expand Down Expand Up @@ -1149,31 +1153,8 @@ static PyMethodDef warnings_functions[] = {


static PyObject *
create_filter(PyObject *category, const char *action)
create_filter(PyObject *category, _Py_Identifier *id)
{
_Py_IDENTIFIER(ignore);
_Py_IDENTIFIER(error);
_Py_IDENTIFIER(always);
_Py_static_string(PyId_default, "default");
_Py_Identifier *id;

if (!strcmp(action, "ignore")) {
id = &PyId_ignore;
}
else if (!strcmp(action, "error")) {
id = &PyId_error;
}
else if (!strcmp(action, "default")) {
id = &PyId_default;
}
else if (!strcmp(action, "always")) {
id = &PyId_always;
}
else {
PyErr_SetString(PyExc_ValueError, "unknown action");
return NULL;
}

PyObject *action_str = _PyUnicode_FromId(id);
if (action_str == NULL) {
return NULL;
Expand All @@ -1200,48 +1181,47 @@ init_filters(void)
}
#endif
PyObject *filters = PyList_New(count);
unsigned int pos = 0; /* Post-incremented in each use. */
unsigned int x;
const char *bytes_action, *resource_action;

if (filters == NULL)
return NULL;

size_t pos = 0; /* Post-incremented in each use. */
#ifndef Py_DEBUG
if (!dev_mode) {
PyList_SET_ITEM(filters, pos++,
create_filter(PyExc_DeprecationWarning, "ignore"));
create_filter(PyExc_DeprecationWarning, &PyId_ignore));
PyList_SET_ITEM(filters, pos++,
create_filter(PyExc_PendingDeprecationWarning, "ignore"));
create_filter(PyExc_PendingDeprecationWarning, &PyId_ignore));
PyList_SET_ITEM(filters, pos++,
create_filter(PyExc_ImportWarning, "ignore"));
create_filter(PyExc_ImportWarning, &PyId_ignore));
}
#endif

_Py_Identifier *bytes_action;
if (Py_BytesWarningFlag > 1)
bytes_action = "error";
bytes_action = &PyId_error;
else if (Py_BytesWarningFlag)
bytes_action = "default";
bytes_action = &PyId_default;
else
bytes_action = "ignore";
bytes_action = &PyId_ignore;
PyList_SET_ITEM(filters, pos++, create_filter(PyExc_BytesWarning,
bytes_action));

_Py_Identifier *resource_action;
/* resource usage warnings are enabled by default in pydebug mode */
#ifdef Py_DEBUG
resource_action = "always";
resource_action = &PyId_always;
#else
resource_action = (dev_mode ? "always" : "ignore");
resource_action = (dev_mode ? &PyId_always : &PyId_ignore);
#endif
PyList_SET_ITEM(filters, pos++, create_filter(PyExc_ResourceWarning,
resource_action));

if (dev_mode) {
PyList_SET_ITEM(filters, pos++,
create_filter(PyExc_Warning, "default"));
create_filter(PyExc_Warning, &PyId_default));
}

for (x = 0; x < pos; x += 1) {
for (size_t x = 0; x < pos; x++) {
if (PyList_GET_ITEM(filters, x) == NULL) {
Py_DECREF(filters);
return NULL;
Expand Down