(original) (raw)

changeset: 99759:688d32cdbc0c parent: 99757:3a6b1186745f parent: 99758:ded1336bff49 user: R David Murray rdmurray@bitdance.com date: Sat Jan 02 15:43:44 2016 -0500 files: Misc/NEWS description: Merge: #22709: Use stdin as-is if it does not have a buffer attribute. diff -r 3a6b1186745f -r 688d32cdbc0c Lib/fileinput.py --- a/Lib/fileinput.py Fri Jan 01 23:27:38 2016 -0800 +++ b/Lib/fileinput.py Sat Jan 02 15:43:44 2016 -0500 @@ -328,7 +328,7 @@ if self._filename == '-': self._filename = '' 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 -r 3a6b1186745f -r 688d32cdbc0c Lib/test/test_fileinput.py --- a/Lib/test/test_fileinput.py Fri Jan 01 23:27:38 2016 -0800 +++ b/Lib/test/test_fileinput.py Sat Jan 02 15:43:44 2016 -0500 @@ -240,6 +240,17 @@ 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 -r 3a6b1186745f -r 688d32cdbc0c Misc/NEWS --- a/Misc/NEWS Fri Jan 01 23:27:38 2016 -0800 +++ b/Misc/NEWS Sat Jan 02 15:43:44 2016 -0500 @@ -128,6 +128,9 @@ 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./rdmurray@bitdance.com