Merge: #22709: Use stdin as-is if it does not have a buffer attribute.

bitdancer · bitdancer · commit 01759d55547c · 2016-01-02T15:43:44.000-05:00
diff --git a/Lib/fileinput.py b/Lib/fileinput.py
@@ -328,7 +328,7 @@ def readline(self):
             if self._filename == '-':
                 self._filename = '<stdin>'
                 if 'b' in self._mode:
-                    self._file = sys.stdin.buffer
+                    self._file = getattr(sys.stdin, 'buffer', sys.stdin)
                 else:
                     self._file = sys.stdin
                 self._isstdin = True
diff --git a/Lib/test/test_fileinput.py b/Lib/test/test_fileinput.py
@@ -240,6 +240,17 @@ def test_stdin_binary_mode(self):
             lines = list(fi)
             self.assertEqual(lines, [b'spam, bacon, sausage, and spam'])
 
+    def test_detached_stdin_binary_mode(self):
+        orig_stdin = sys.stdin
+        try:
+            sys.stdin = BytesIO(b'spam, bacon, sausage, and spam')
+            self.assertFalse(hasattr(sys.stdin, 'buffer'))
+            fi = FileInput(files=['-'], mode='rb')
+            lines = list(fi)
+            self.assertEqual(lines, [b'spam, bacon, sausage, and spam'])
+        finally:
+            sys.stdin = orig_stdin
+
     def test_file_opening_hook(self):
         try:
             # cannot use openhook and inplace mode
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -128,6 +128,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #25447: fileinput now uses sys.stdin as-is if it does not have a
+  buffer attribute (restores backward compatibility).
+
 - Issue #25971: Optimized creating Fractions from floats by 2 times and from
   Decimals by 3 times.
 
