map(None, ...) is not supported in 3.0.

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 71beeba32141734633498a644606b9ab38d53eb0..648637df5155cdc07f9ebdf5264a983046f040ca 100644 (file)
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -909,9 +909,15 @@ builtin_map(PyObject *self, PyObject *args)
        func = PyTuple_GetItem(args, 0);
        n--;
 
-       if (func == Py_None && n == 1) {
-               /* map(None, S) is the same as list(S). */
-               return PySequence_List(PyTuple_GetItem(args, 1));
+       if (func == Py_None) {
+               if (Py_Py3kWarningFlag &&
+                   PyErr_Warn(PyExc_DeprecationWarning, 
+                              "map(None, ...) not supported in 3.x") < 0)
+                       return NULL;
+               if (n == 1) {
+                       /* map(None, S) is the same as list(S). */
+                       return PySequence_List(PyTuple_GetItem(args, 1));
+               }
        }
 
        /* Get space for sequence descriptors.  Must NULL out the iterator