Correct comments and improve failure reports in test_fileinput (closes python#20501).

serhiy-storchaka · serhiy-storchaka · commit 682ea5f70e54 · 2014-03-03T21:17:17.000+02:00
Thanks Vajrasky Kok and Zachary Ware.
diff --git a/Lib/test/test_fileinput.py b/Lib/test/test_fileinput.py
@@ -269,9 +269,12 @@ def test_readline(self):
 
         with FileInput(files=TESTFN,
                        openhook=hook_encoded('ascii'), bufsize=8) as fi:
-            self.assertEqual(fi.readline(), 'A\n')
-            self.assertEqual(fi.readline(), 'B\n')
-            self.assertEqual(fi.readline(), 'C\n')
+            try:
+                self.assertEqual(fi.readline(), 'A\n')
+                self.assertEqual(fi.readline(), 'B\n')
+                self.assertEqual(fi.readline(), 'C\n')
+            except UnicodeDecodeError:
+                self.fail('Read to end of file')
             with self.assertRaises(UnicodeDecodeError):
                 # Read to the end of file.
                 list(fi)
@@ -854,8 +857,8 @@ def test(self):
         self.assertFalse(kwargs)
 
     def test_modes(self):
-        # Unlikely UTF-7 is locale encoding
         with open(TESTFN, 'wb') as f:
+            # UTF-7 is a convenient, seldom used encoding
             f.write(b'A\nB\r\nC\rD+IKw-')
         self.addCleanup(safe_unlink, TESTFN)
 
