Fix a probable merge glitch in r66695:

amauryfa · amauryfa · commit 58fb905ad08e · 2008-09-30T20:22:44.000Z
a redundant check that actually belongs to another function.
diff --git a/Modules/_stringio.c b/Modules/_stringio.c
@@ -140,6 +140,8 @@ stringio_read(StringIOObject *self, PyObject *args)
 
     if (PyLong_Check(arg)) {
         size = PyLong_AsSsize_t(arg);
+        if (size == -1 && PyErr_Occurred())
+            return NULL;
     }
     else if (arg == Py_None) {
         /* Read until EOF is reached, by default. */
@@ -179,8 +181,6 @@ stringio_truncate(StringIOObject *self, PyObject *args)
         size = PyLong_AsSsize_t(arg);
         if (size == -1 && PyErr_Occurred())
             return NULL;
-        if (size == -1 && PyErr_Occurred())
-            return NULL;
     }
     else if (arg == Py_None) {
         /* Truncate to current position if no argument is passed. */
