SF #1048865: Fix a trivial typo that breaks StreamReader.readlines()

diff --git a/Lib/codecs.py b/Lib/codecs.py
index f831dd633758eb040d4da930aa85d808be2f8b59..ab12237f8883b324bd94630f7fc64085d0ba9140 100644 (file)
--- a/Lib/codecs.py
+++ b/Lib/codecs.py
@@ -334,7 +334,7 @@ class StreamReader(Codec):
 
         """
         data = self.read()
-        return self.splitlines(keepends)
+        return data.splitlines(keepends)
 
     def reset(self):
 

diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
index 524c247d8c3f4a3d5d20fb095d167d607bc960cb..54d9da5b0ac6261c473e374f23408cd3d5e0175d 100644 (file)
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@ -458,6 +458,16 @@ class CodecsModuleTest(unittest.TestCase):
         self.assertEquals(codecs.encode(u'\xe4\xf6\xfc', 'latin-1'),
                           '\xe4\xf6\xfc')
 
+class StreamReaderTest(unittest.TestCase):
+
+    def setUp(self):
+        self.reader = codecs.getreader('utf-8')
+        self.stream = StringIO.StringIO('\xed\x95\x9c\n\xea\xb8\x80')
+
+    def test_readlines(self):
+        f = self.reader(self.stream)
+        self.assertEquals(f.readlines(), [u'\ud55c\n', u'\uae00'])
+
 def test_main():
     test_support.run_unittest(
         UTF16Test,
@@ -469,7 +479,8 @@ def test_main():
         PunycodeTest,
         NameprepTest,
         CodecTest,
-        CodecsModuleTest
+        CodecsModuleTest,
+        StreamReaderTest
     )