Use PyErr_WarnPy3k throughout
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index d552098..2291524 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -1778,10 +1778,8 @@
}
else {
/* Py3K warning if comparison isn't == or != */
- if (Py_Py3kWarningFlag &&
- PyErr_Warn(PyExc_DeprecationWarning,
- "dict inequality comparisons not supported "
- "in 3.x") < 0) {
+ if (PyErr_WarnPy3k("dict inequality comparisons not supported "
+ "in 3.x", 1) < 0) {
return NULL;
}
res = Py_NotImplemented;
@@ -1811,10 +1809,8 @@
static PyObject *
dict_has_key(register PyDictObject *mp, PyObject *key)
{
- if (Py_Py3kWarningFlag &&
- PyErr_Warn(PyExc_DeprecationWarning,
- "dict.has_key() not supported in 3.x; "
- "use the in operator") < 0)
+ if (PyErr_WarnPy3k("dict.has_key() not supported in 3.x; "
+ "use the in operator", 1) < 0)
return NULL;
return dict_contains(mp, key);
}