diff options
| author | Georg Brandl <georg@python.org> | 2008-03-25 08:29:14 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2008-03-25 08:29:14 (GMT) |
| commit | d5b635f1969fdd609f0aff5669c9ec30e61be62e (patch) | |
| tree | 1c854f8108e2b22d8c5ba4d529b6d99cd9f5f244 /Objects/object.c | |
| parent | 80055f6295dd48274ae68d13806c7ee3c5b5882f (diff) | |
| download | cpython-d5b635f1969fdd609f0aff5669c9ec30e61be62e.zip cpython-d5b635f1969fdd609f0aff5669c9ec30e61be62e.tar.gz cpython-d5b635f1969fdd609f0aff5669c9ec30e61be62e.tar.bz2 | |
Make Py3k warnings consistent w.r.t. punctuation; also respect the
EOL 80 limit and supply more alternatives in warning messages.
Diffstat (limited to 'Objects/object.c')
| -rw-r--r-- | Objects/object.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Objects/object.c b/Objects/object.c index 4a66f4f..e3377f3 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -867,9 +867,10 @@ try_3way_to_rich_compare(PyObject *v, PyObject *w, int op) /* Py3K warning if types are not equal and comparison isn't == or != */ if (Py_Py3kWarningFlag && - v->ob_type != w->ob_type && op != Py_EQ && op != Py_NE && - PyErr_Warn(PyExc_DeprecationWarning, - "comparing unequal types not supported in 3.x.") < 0) { + v->ob_type != w->ob_type && op != Py_EQ && op != Py_NE && + PyErr_Warn(PyExc_DeprecationWarning, + "comparing unequal types not supported " + "in 3.x") < 0) { return NULL; } @@ -1691,8 +1692,8 @@ merge_list_attr(PyObject* dict, PyObject* obj, const char *attrname) (strcmp(attrname, "__members__") == 0 || strcmp(attrname, "__methods__") == 0)) { if (PyErr_Warn(PyExc_DeprecationWarning, - "__members__ and __methods__ not supported " - "in 3.x") < 0) { + "__members__ and __methods__ not " + "supported in 3.x") < 0) { Py_XDECREF(list); return -1; } |