diff options
| author | Marc-André Lemburg <mal@egenix.com> | 2000-07-05 15:32:40 (GMT) |
|---|---|---|
| committer | Marc-André Lemburg <mal@egenix.com> | 2000-07-05 15:32:40 (GMT) |
| commit | 1f46860a29de4b303fe8f2e7b1b82a7c86be19c0 (patch) | |
| tree | e88bc99108dd7045465674670ede0fdf645c9b40 | |
| parent | da13f89fee60ea0ec51403457272a2c47592877c (diff) | |
| download | cpython-1f46860a29de4b303fe8f2e7b1b82a7c86be19c0.zip cpython-1f46860a29de4b303fe8f2e7b1b82a7c86be19c0.tar.gz cpython-1f46860a29de4b303fe8f2e7b1b82a7c86be19c0.tar.bz2 | |
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)
| -rw-r--r-- | Objects/fileobject.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Objects/fileobject.c b/Objects/fileobject.c index 5d2ef8f..7247ff8 100644 --- a/Objects/fileobject.c +++ b/Objects/fileobject.c @@ -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; |