Patch #650834: Document 'U' in file mode, remove stale variables.
This commit is contained in:
parent
0479104a91
commit
6233c9b470
@ -1614,7 +1614,7 @@ static PyMemberDef file_memberlist[] = {
|
|||||||
{"softspace", T_INT, OFF(f_softspace), 0,
|
{"softspace", T_INT, OFF(f_softspace), 0,
|
||||||
"flag indicating that a space needs to be printed; used by print"},
|
"flag indicating that a space needs to be printed; used by print"},
|
||||||
{"mode", T_OBJECT, OFF(f_mode), RO,
|
{"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,
|
{"name", T_OBJECT, OFF(f_name), RO,
|
||||||
"file name"},
|
"file name"},
|
||||||
/* getattr(f, "closed") is implemented without this table */
|
/* getattr(f, "closed") is implemented without this table */
|
||||||
@ -1767,13 +1767,9 @@ file_iternext(PyFileObject *f)
|
|||||||
{
|
{
|
||||||
PyStringObject* l;
|
PyStringObject* l;
|
||||||
|
|
||||||
int i;
|
|
||||||
|
|
||||||
if (f->f_fp == NULL)
|
if (f->f_fp == NULL)
|
||||||
return err_closed();
|
return err_closed();
|
||||||
|
|
||||||
i = f->f_softspace;
|
|
||||||
|
|
||||||
l = readahead_get_line_skip(f, 0, READAHEAD_BUFSIZE);
|
l = readahead_get_line_skip(f, 0, READAHEAD_BUFSIZE);
|
||||||
if (l == NULL || PyString_GET_SIZE(l) == 0) {
|
if (l == NULL || PyString_GET_SIZE(l) == 0) {
|
||||||
Py_XDECREF(l);
|
Py_XDECREF(l);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user