Fix to bug #389:
Full_Name: Bastian Kleineidam Version: 2.0b1 CVS 5.7.2000 OS: Debian Linux 2.2 Submission from: earth.cs.uni-sb.de (134.96.252.92)
This commit is contained in:
parent
da13f89fee
commit
1f46860a29
|
@ -583,7 +583,7 @@ file_readinto(f, args)
|
|||
*/
|
||||
|
||||
static PyObject *
|
||||
getline(f, n)
|
||||
get_line(f, n)
|
||||
PyFileObject *f;
|
||||
int n;
|
||||
{
|
||||
|
@ -705,7 +705,7 @@ PyFile_GetLine(f, n)
|
|||
}
|
||||
if (((PyFileObject*)f)->f_fp == NULL)
|
||||
return err_closed();
|
||||
return getline((PyFileObject *)f, n);
|
||||
return get_line((PyFileObject *)f, n);
|
||||
}
|
||||
|
||||
/* Python method */
|
||||
|
@ -725,7 +725,7 @@ file_readline(f, args)
|
|||
return PyString_FromString("");
|
||||
if (n < 0)
|
||||
n = 0;
|
||||
return getline(f, n);
|
||||
return get_line(f, n);
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
|
@ -819,7 +819,7 @@ file_readlines(f, args)
|
|||
goto error;
|
||||
if (sizehint > 0) {
|
||||
/* Need to complete the last line */
|
||||
PyObject *rest = getline(f, 0);
|
||||
PyObject *rest = get_line(f, 0);
|
||||
if (rest == NULL) {
|
||||
Py_DECREF(line);
|
||||
goto error;
|
||||
|
|
Loading…
Reference in New Issue