merge 3.3

This commit is contained in:
Benjamin Peterson 2014-04-14 11:48:21 -04:00
commit 70d92a96ab
1 changed files with 5 additions and 4 deletions

View File

@ -941,10 +941,11 @@ scan_once_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ssize_
kind = PyUnicode_KIND(pystr);
length = PyUnicode_GET_LENGTH(pystr);
if (idx < 0)
/* Compatibility with Python version. */
idx += length;
if (idx < 0 || idx >= length) {
if (idx < 0) {
PyErr_SetString(PyExc_ValueError, "idx cannot be negative");
return NULL;
}
if (idx >= length) {
raise_stop_iteration(idx);
return NULL;
}