]> granicus.if.org Git - python/commitdiff
Remove itertools warnings I had added before the 2-to-3 handled the migration.
authorRaymond Hettinger <python@rcn.com>
Wed, 19 Mar 2008 18:01:58 +0000 (18:01 +0000)
committerRaymond Hettinger <python@rcn.com>
Wed, 19 Mar 2008 18:01:58 +0000 (18:01 +0000)
Modules/itertoolsmodule.c

index 8e785bedf566ac623e397b548fcf6bb4539fdd72..261e8f1b6f8866108efcb8a5c97edba2fd946d5d 100644 (file)
@@ -1445,11 +1445,6 @@ imap_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
        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;
 
@@ -2541,11 +2536,6 @@ ifilter_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
        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;
 
@@ -2689,11 +2679,6 @@ ifilterfalse_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
        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;
@@ -3000,11 +2985,6 @@ izip_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
        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;
 
@@ -3341,11 +3321,6 @@ izip_longest_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
        PyObject *fillvalue = Py_None;
        Py_ssize_t tuplesize = PySequence_Length(args);
 
-       if (Py_Py3kWarningFlag &&
-           PyErr_Warn(PyExc_DeprecationWarning, 
-                      "In 3.x, izip_longest() was 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) {