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

Patch # 188 by Philip Jenvey. 

Make tell() mark CRLF as a newline.
With unit test.
This commit is contained in:
Guido van Rossum 2007-09-22 20:18:03 +00:00
parent aaad0d602b
commit ad8fb0d47c
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/test/test_univnewlines.py
View File

@ -105,6 +105,13 @@ class TestCRLFNewlines(TestGenericUnivNewlines):
NEWLINE = '\r\n' NEWLINE = '\r\n'
DATA = DATA_CRLF DATA = DATA_CRLF
def test_tell(self):
fp = open(test_support.TESTFN, self.READMODE)
self.assertEqual(repr(fp.newlines), repr(None))
data = fp.readline()
pos = fp.tell()
self.assertEqual(repr(fp.newlines), repr(self.NEWLINE))
class TestMixedNewlines(TestGenericUnivNewlines): class TestMixedNewlines(TestGenericUnivNewlines):
NEWLINE = ('\r', '\n') NEWLINE = ('\r', '\n')
DATA = DATA_MIXED DATA = DATA_MIXED

1
Objects/fileobject.c
View File

@ -718,6 +718,7 @@ file_tell(PyFileObject *f)
int c; int c;
c = GETC(f->f_fp); c = GETC(f->f_fp);
if (c == '\n') { if (c == '\n') {
f->f_newlinetypes |= NEWLINE_CRLF;
pos++; pos++;
f->f_skipnextlf = 0; f->f_skipnextlf = 0;
} else if (c != EOF) ungetc(c, f->f_fp); } else if (c != EOF) ungetc(c, f->f_fp);