Get rid of xreadlines() (methods).

4 files changed, 4 insertions, 12 deletions

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')