Added a warning when -3 is enabled and None is passed to filter as the first argument.

david.wolever · david.wolever · commit b1d9d238eaae · 2008-03-18T21:20:25.000Z
git-svn-id: http://svn.python.org/projects/python/trunk@61564 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
@@ -296,6 +296,13 @@ builtin_filter(PyObject *self, PyObject *args)
 		}
 
 		if (func == (PyObject *)&PyBool_Type || func == Py_None) {
+			if (Py_Py3kWarningFlag &&
+			    PyErr_Warn(PyExc_DeprecationWarning,
+				       "filter with None as a first argument "
+				       "is not supported in 3.x.  Use a list "
+				       "comprehension instead.") < 0)
+				return NULL;
+
 			ok = PyObject_IsTrue(item);
 		}
 		else {

Original file line number	Diff line number	Diff line change
`@@ -296,6 +296,13 @@ builtin_filter(PyObject self, PyObject args)`
`296`	`296`	`}`
`297`	`297`
`298`	`298`	`if (func == (PyObject *)&PyBool_Type \|\| func == Py_None) {`
	`299`	`+ if (Py_Py3kWarningFlag &&`
	`300`	`+ PyErr_Warn(PyExc_DeprecationWarning,`
	`301`	`+ "filter with None as a first argument "`
	`302`	`+ "is not supported in 3.x. Use a list "`
	`303`	`+ "comprehension instead.") < 0)`
	`304`	`+ return NULL;`
	`305`	`+`
`299`	`306`	`ok = PyObject_IsTrue(item);`
`300`	`307`	`}`
`301`	`308`	`else {`