diff options
| -rw-r--r-- | Doc/lib/libbz2.tex | 9 | ||||
| -rw-r--r-- | Doc/lib/libstdtypes.tex | 6 | ||||
| -rw-r--r-- | Doc/tools/undoc_symbols.py | 2 | ||||
| -rw-r--r-- | Lib/rexec.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_bz2.py | 10 | ||||
| -rw-r--r-- | Lib/test/test_decimal.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_file.py | 2 | ||||
| -rw-r--r-- | Misc/python.man | 2 | ||||
| -rw-r--r-- | Modules/bz2module.c | 8 | ||||
| -rw-r--r-- | Objects/fileobject.c | 7 | ||||
| -rw-r--r-- | README | 6 |
11 files changed, 9 insertions, 47 deletions
diff --git a/Doc/lib/libbz2.tex b/Doc/lib/libbz2.tex index f40b66f..11801fe 100644 --- a/Doc/lib/libbz2.tex +++ b/Doc/lib/libbz2.tex @@ -79,15 +79,6 @@ Return a list of lines read. The optional \var{size} argument, if given, is an approximate bound on the total number of bytes in the lines returned. \end{methoddesc} -\begin{methoddesc}[BZ2File]{xreadlines}{} -For backward compatibility. \class{BZ2File} objects now include the -performance optimizations previously implemented in the -\module{xreadlines} module. -\deprecated{2.3}{This exists only for compatibility with the method by - this name on \class{file} objects, which is - deprecated. Use \code{for line in file} instead.} -\end{methoddesc} - \begin{methoddesc}[BZ2File]{seek}{offset\optional{, whence}} Move to new file position. Argument \var{offset} is a byte count. Optional argument \var{whence} defaults to \code{0} (offset from start of file, diff --git a/Doc/lib/libstdtypes.tex b/Doc/lib/libstdtypes.tex index 5d15375..d2a0425 100644 --- a/Doc/lib/libstdtypes.tex +++ b/Doc/lib/libstdtypes.tex @@ -1583,12 +1583,6 @@ flush the read-ahead buffer. implemented, or cannot be implemented efficiently. \end{methoddesc} -\begin{methoddesc}[file]{xreadlines}{} - This method returns the same thing as \code{iter(f)}. - \versionadded{2.1} - \deprecated{2.3}{Use \samp{for \var{line} in \var{file}} instead.} -\end{methoddesc} - \begin{methoddesc}[file]{seek}{offset\optional{, whence}} Set the file's current position, like \code{stdio}'s \cfunction{fseek()}. The \var{whence} argument is optional and defaults to \code{0} diff --git a/Doc/tools/undoc_symbols.py b/Doc/tools/undoc_symbols.py index 3d776fa..782ab6c 100644 --- a/Doc/tools/undoc_symbols.py +++ b/Doc/tools/undoc_symbols.py @@ -50,7 +50,7 @@ import os, glob, re, sys def findnames(file, prefixes=()): names = {} - for line in file.xreadlines(): + for line in file: if line[0] == '!': continue fields = line.split() diff --git a/Lib/rexec.py b/Lib/rexec.py index 89ff509..ed01d24 100644 --- a/Lib/rexec.py +++ b/Lib/rexec.py @@ -29,7 +29,7 @@ __all__ = ["RExec"] class FileBase: ok_file_methods = ('fileno', 'flush', 'isatty', 'read', 'readline', - 'readlines', 'seek', 'tell', 'write', 'writelines', 'xreadlines', + 'readlines', 'seek', 'tell', 'write', 'writelines', '__iter__') diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py index 504a6d7..356c2e3 100644 --- a/Lib/test/test_bz2.py +++ b/Lib/test/test_bz2.py @@ -110,14 +110,6 @@ class BZ2FileTest(BaseTest): self.assertEqual(list(iter(bz2f)), sio.readlines()) bz2f.close() - def testXReadLines(self): - # "Test BZ2File.xreadlines()" - self.createTempFile() - bz2f = BZ2File(self.filename) - sio = StringIO(self.TEXT) - self.assertEqual(list(bz2f.xreadlines()), sio.readlines()) - bz2f.close() - def testUniversalNewlinesLF(self): # "Test BZ2File.read() with universal newlines (\\n)" self.createTempFile() @@ -256,7 +248,7 @@ class BZ2FileTest(BaseTest): bz2f.close() self.assertEqual(lines, ['Test']) bz2f = BZ2File(self.filename) - xlines = list(bz2f.xreadlines()) + xlines = list(bz2f.readlines()) bz2f.close() self.assertEqual(lines, ['Test']) diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py index 34f034b..7d0addf 100644 --- a/Lib/test/test_decimal.py +++ b/Lib/test/test_decimal.py @@ -132,7 +132,7 @@ class DecimalTest(unittest.TestCase): if skip_expected: raise TestSkipped return - for line in open(file).xreadlines(): + for line in open(file): line = line.replace('\r\n', '').replace('\n', '') #print line try: diff --git a/Lib/test/test_file.py b/Lib/test/test_file.py index efb06f4..fd5670a 100644 --- a/Lib/test/test_file.py +++ b/Lib/test/test_file.py @@ -179,7 +179,7 @@ for s in (-1, 0, 1, 512): methods = ['fileno', 'flush', 'isatty', 'next', 'read', 'readinto', 'readline', 'readlines', 'seek', 'tell', 'truncate', 'write', - 'xreadlines', '__iter__'] + '__iter__'] if sys.platform.startswith('atheos'): methods.remove('truncate') diff --git a/Misc/python.man b/Misc/python.man index 705f7bc..42f0123 100644 --- a/Misc/python.man +++ b/Misc/python.man @@ -152,7 +152,7 @@ expressed in spaces. Issue an error when the option is given twice. .B \-u Force stdin, stdout and stderr to be totally unbuffered. On systems where it matters, also put stdin, stdout and stderr in binary mode. -Note that there is internal buffering in xreadlines(), readlines() and +Note that there is internal buffering in readlines() and file-object iterators ("for line in sys.stdin") which is not influenced by this option. To work around this, you will want to use "sys.stdin.readline()" inside a "while 1:" loop. diff --git a/Modules/bz2module.c b/Modules/bz2module.c index ed329b8..9576895 100644 --- a/Modules/bz2module.c +++ b/Modules/bz2module.c @@ -778,13 +778,6 @@ BZ2File_readlines(BZ2FileObject *self, PyObject *args) return list; } -PyDoc_STRVAR(BZ2File_xreadlines__doc__, -"xreadlines() -> self\n\ -\n\ -For backward compatibility. BZ2File objects now include the performance\n\ -optimizations previously implemented in the xreadlines module.\n\ -"); - PyDoc_STRVAR(BZ2File_write__doc__, "write(data) -> None\n\ \n\ @@ -1183,7 +1176,6 @@ static PyMethodDef BZ2File_methods[] = { {"read", (PyCFunction)BZ2File_read, METH_VARARGS, BZ2File_read__doc__}, {"readline", (PyCFunction)BZ2File_readline, METH_VARARGS, BZ2File_readline__doc__}, {"readlines", (PyCFunction)BZ2File_readlines, METH_VARARGS, BZ2File_readlines__doc__}, - {"xreadlines", (PyCFunction)BZ2File_getiter, METH_VARARGS, BZ2File_xreadlines__doc__}, {"write", (PyCFunction)BZ2File_write, METH_VARARGS, BZ2File_write__doc__}, {"writelines", (PyCFunction)BZ2File_writelines, METH_O, BZ2File_writelines__doc__}, {"seek", (PyCFunction)BZ2File_seek, METH_VARARGS, BZ2File_seek__doc__}, diff --git a/Objects/fileobject.c b/Objects/fileobject.c index 57a9e9d..f96ee7b 100644 --- a/Objects/fileobject.c +++ b/Objects/fileobject.c @@ -1675,12 +1675,6 @@ PyDoc_STRVAR(readlines_doc, "The optional size argument, if given, is an approximate bound on the\n" "total number of bytes in the lines returned."); -PyDoc_STRVAR(xreadlines_doc, -"xreadlines() -> returns self.\n" -"\n" -"For backward compatibility. File objects now include the performance\n" -"optimizations previously implemented in the xreadlines module."); - PyDoc_STRVAR(writelines_doc, "writelines(sequence_of_strings) -> None. Write the strings to the file.\n" "\n" @@ -1719,7 +1713,6 @@ static PyMethodDef file_methods[] = { {"tell", (PyCFunction)file_tell, METH_NOARGS, tell_doc}, {"readinto", (PyCFunction)file_readinto, METH_VARARGS, readinto_doc}, {"readlines", (PyCFunction)file_readlines,METH_VARARGS, readlines_doc}, - {"xreadlines",(PyCFunction)file_self, METH_NOARGS, xreadlines_doc}, {"writelines",(PyCFunction)file_writelines, METH_O, writelines_doc}, {"flush", (PyCFunction)file_flush, METH_NOARGS, flush_doc}, {"close", (PyCFunction)file_close, METH_NOARGS, close_doc}, @@ -504,9 +504,9 @@ Cray T3E: Mark Hadfield (m.hadfield@niwa.co.nz) writes: _codecs, _locale, _socket, _symtable, _testcapi, _weakref array, binascii, cmath, cPickle, crypt, cStringIO, dbm - errno, fcntl, grp, math, md5, operator, parser, pcre, pwd - regex, rotor, select, struct, strop, syslog, termios - time, timing, xreadlines + errno, fcntl, grp, math, md5, operator, parser, pwd + rotor, select, struct, strop, syslog, termios, + time, timing 4) Once the python executable and library have been built, make will execute setup.py, which will attempt to build remaining |