From 58fb905ad08ef8dcea8c636755d0441f33c2b655 Mon Sep 17 00:00:00 2001 From: Amaury Forgeot d'Arc Date: Tue, 30 Sep 2008 20:22:44 +0000 Subject: Fix a probable merge glitch in r66695: a redundant check that actually belongs to another function. --- Modules/_stringio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/_stringio.c b/Modules/_stringio.c index d29fe64..f342048 100644 --- 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. */ -- cgit v0.12