]> granicus.if.org Git - python/commitdiff
Issue 6305: Clarify error message for large arguments to itertools.islice().
authorRaymond Hettinger <python@rcn.com>
Tue, 23 Jun 2009 21:27:39 +0000 (21:27 +0000)
committerRaymond Hettinger <python@rcn.com>
Tue, 23 Jun 2009 21:27:39 +0000 (21:27 +0000)
Modules/itertoolsmodule.c

index f1e76e2ba9c16f905ea242d75673aed1dc567f9b..732bcd9fc2099d10179636caa5696db40cd4a705 100644 (file)
@@ -1137,7 +1137,7 @@ islice_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
                                if (PyErr_Occurred())
                                        PyErr_Clear();
                                PyErr_SetString(PyExc_ValueError,
-                                  "Stop argument for islice() must be a non-negative integer or None.");
+                                  "Stop argument for islice() must be None or an integer: 0 <= x <= maxsize.");
                                return NULL;
                        }
                }
@@ -1152,14 +1152,14 @@ islice_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
                                if (PyErr_Occurred())
                                        PyErr_Clear();
                                PyErr_SetString(PyExc_ValueError,
-                                  "Stop argument for islice() must be a non-negative integer or None.");
+                                  "Stop argument for islice() must be None or an integer: 0 <= x <= maxsize.");
                                return NULL;
                        }
                }
        }
        if (start<0 || stop<-1) {
                PyErr_SetString(PyExc_ValueError,
-                  "Indices for islice() must be non-negative integers or None.");
+                  "Indices for islice() must be None or an integer: 0 <= x <= maxsize.");
                return NULL;
        }