[Python-checkins] r61367 - python/trunk/Modules/itertoolsmodule.c

[raymond.hettinger]

Author: raymond.hettinger
Date: Thu Mar 13 17:43:17 2008
New Revision: 61367

Modified:
   python/trunk/Modules/itertoolsmodule.c
Log:
Add 2-to-3 support for the itertools moved to builtins or renamed.

Modified: python/trunk/Modules/itertoolsmodule.c
==============================================================================
--- python/trunk/Modules/itertoolsmodule.c	(original)
+++ python/trunk/Modules/itertoolsmodule.c	Thu Mar 13 17:43:17 2008
@@ -1445,6 +1445,11 @@
 	imapobject *lz;
 	Py_ssize_t numargs, i;
 
+	if (Py_Py3kWarningFlag &&
+	    PyErr_Warn(PyExc_DeprecationWarning, 
+		       "In 3.x, itertools.imap() was moved to builtin map()") < 0)
+		return NULL;
+
 	if (type == &imap_type && !_PyArg_NoKeywords("imap()", kwds))
 		return NULL;
 
@@ -2536,6 +2541,11 @@
 	PyObject *it;
 	ifilterobject *lz;
 
+	if (Py_Py3kWarningFlag &&
+	    PyErr_Warn(PyExc_DeprecationWarning, 
+		       "In 3.x, itertools.ifilter() was moved to builtin filter().") < 0)
+		return NULL;
+
 	if (type == &ifilter_type && !_PyArg_NoKeywords("ifilter()", kwds))
 		return NULL;
 
@@ -2679,6 +2689,11 @@
 	PyObject *it;
 	ifilterfalseobject *lz;
 
+	if (Py_Py3kWarningFlag &&
+	    PyErr_Warn(PyExc_DeprecationWarning, 
+		       "In 3.x, ifilterfalse() was renamed to filterfalse().") < 0)
+		return NULL;
+
 	if (type == &ifilterfalse_type &&
 	    !_PyArg_NoKeywords("ifilterfalse()", kwds))
 		return NULL;
@@ -2985,6 +3000,11 @@
 	PyObject *result;
 	Py_ssize_t tuplesize = PySequence_Length(args);
 
+	if (Py_Py3kWarningFlag &&
+	    PyErr_Warn(PyExc_DeprecationWarning, 
+		       "In 3.x, itertools.izip() was moved to builtin zip()") < 0)
+		return NULL;
+
 	if (type == &izip_type && !_PyArg_NoKeywords("izip()", kwds))
 		return NULL;
 
@@ -3321,6 +3341,11 @@
 	PyObject *fillvalue = Py_None;
 	Py_ssize_t tuplesize = PySequence_Length(args);
 
+	if (Py_Py3kWarningFlag &&
+	    PyErr_Warn(PyExc_DeprecationWarning, 
+		       "In 3.x, izip_longest() is renamed to zip_longest().") < 0)
+		return NULL;
+
         if (kwds != NULL && PyDict_CheckExact(kwds) && PyDict_Size(kwds) > 0) {
                 fillvalue = PyDict_GetItemString(kwds, "fillvalue");
                 if (fillvalue == NULL  ||  PyDict_Size(kwds) > 1) {