Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix a probable merge glitch in r66695: 

a redundant check that actually belongs to another function.
This commit is contained in:
Amaury Forgeot d'Arc 2008-09-30 20:22:44 +00:00
parent c9e435ee2b
commit 58fb905ad0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/_stringio.c
View File

@ -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. */