1 files changed, 7 insertions, 0 deletions
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 8491ed410a..228bb2d01b 100644
--- 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 {