From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sun, 24 Feb 2008 02:20:25 +0000 (+0000)
Subject: map(None, ...) is not supported in 3.0.
X-Git-Tag: v2.6a1~70
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=53152a1905147e50ee38ff681252292e90ee7474;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 71beeba32141..648637df5155 100644
--- 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