Issue 6305: Clarify error message for large arguments to itertools.islice().

rhettinger · rhettinger · commit ec7bfb314c9f · 2009-06-23T21:27:39.000Z
diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c
@@ -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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1137,7 +1137,7 @@ islice_new(PyTypeObject type, PyObject args, PyObject *kwds)`
`1137`	`1137`	`if (PyErr_Occurred())`
`1138`	`1138`	`PyErr_Clear();`
`1139`	`1139`	`PyErr_SetString(PyExc_ValueError,`
`1140`		`- "Stop argument for islice() must be a non-negative integer or None.");`
	`1140`	`+ "Stop argument for islice() must be None or an integer: 0 <= x <= maxsize.");`
`1141`	`1141`	`return NULL;`
`1142`	`1142`	`}`
`1143`	`1143`	`}`
`@@ -1152,14 +1152,14 @@ islice_new(PyTypeObject type, PyObject args, PyObject *kwds)`
`1152`	`1152`	`if (PyErr_Occurred())`
`1153`	`1153`	`PyErr_Clear();`
`1154`	`1154`	`PyErr_SetString(PyExc_ValueError,`
`1155`		`- "Stop argument for islice() must be a non-negative integer or None.");`
	`1155`	`+ "Stop argument for islice() must be None or an integer: 0 <= x <= maxsize.");`
`1156`	`1156`	`return NULL;`
`1157`	`1157`	`}`
`1158`	`1158`	`}`
`1159`	`1159`	`}`
`1160`	`1160`	`if (start<0 \|\| stop<-1) {`
`1161`	`1161`	`PyErr_SetString(PyExc_ValueError,`
`1162`		`- "Indices for islice() must be non-negative integers or None.");`
	`1162`	`+ "Indices for islice() must be None or an integer: 0 <= x <= maxsize.");`
`1163`	`1163`	`return NULL;`
`1164`	`1164`	`}`
`1165`	`1165`