From: Martin v. Löwis Date: Wed, 11 Dec 2002 13:06:53 +0000 (+0000) Subject: Patch #650834: Document 'U' in file mode, remove stale variables. X-Git-Tag: v2.3c1~3071 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6233c9b470edaf9ddd4e43ccf6a9c0db38ded4d7;p=thirdparty%2FPython%2Fcpython.git Patch #650834: Document 'U' in file mode, remove stale variables. --- diff --git a/Objects/fileobject.c b/Objects/fileobject.c index b6c88dbf229f..86620ff867ed 100644 --- a/Objects/fileobject.c +++ b/Objects/fileobject.c @@ -1614,7 +1614,7 @@ static PyMemberDef file_memberlist[] = { {"softspace", T_INT, OFF(f_softspace), 0, "flag indicating that a space needs to be printed; used by print"}, {"mode", T_OBJECT, OFF(f_mode), RO, - "file mode ('r', 'w', 'a', possibly with 'b' or '+' added)"}, + "file mode ('r', 'U', 'w', 'a', possibly with 'b' or '+' added)"}, {"name", T_OBJECT, OFF(f_name), RO, "file name"}, /* getattr(f, "closed") is implemented without this table */ @@ -1767,13 +1767,9 @@ file_iternext(PyFileObject *f) { PyStringObject* l; - int i; - if (f->f_fp == NULL) return err_closed(); - i = f->f_softspace; - l = readahead_get_line_skip(f, 0, READAHEAD_BUFSIZE); if (l == NULL || PyString_GET_SIZE(l) == 0) { Py_XDECREF(l);