Make Py3k warnings consistent w.r.t. punctuation; also respect the
EOL 80 limit and supply more alternatives in warning messages.
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 1ca2830..b897118 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -1778,8 +1778,10 @@
}
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 (Py_Py3kWarningFlag &&
+ PyErr_Warn(PyExc_DeprecationWarning,
+ "dict inequality comparisons not supported "
+ "in 3.x") < 0) {
return NULL;
}
res = Py_NotImplemented;
@@ -1811,7 +1813,8 @@
{
if (Py_Py3kWarningFlag &&
PyErr_Warn(PyExc_DeprecationWarning,
- "dict.has_key() not supported in 3.x") < 0)
+ "dict.has_key() not supported in 3.x; "
+ "use the in operator") < 0)
return NULL;
return dict_contains(mp, key);
}