diff Objects/object.c @ 46075:84bb7701efba legacy-trunk

Make Py3k warnings consistent w.r.t. punctuation; also respect the EOL 80 limit and supply more alternatives in warning messages.
author Georg Brandl <georg@python.org>
date Tue, 25 Mar 2008 08:29:14 +0000
parents 2275612c16a9
children 5341b30b1812
line wrap: on
line diff
--- a/Objects/object.c	Tue Mar 25 07:56:27 2008 +0000
+++ b/Objects/object.c	Tue Mar 25 08:29:14 2008 +0000
@@ -867,9 +867,10 @@
 
 		/* 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 @@
 		    (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;
 			}