diff options
| -rw-r--r-- | Lib/shutil.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_shutil.py | 2 | ||||
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 4 |
4 files changed, 8 insertions, 1 deletions
diff --git a/Lib/shutil.py b/Lib/shutil.py index 3f4b6bf663..7f8edf5e5a 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -1069,7 +1069,7 @@ def get_terminal_size(fallback=(80, 24)): if columns <= 0 or lines <= 0: try: size = os.get_terminal_size(sys.__stdout__.fileno()) - except (NameError, OSError): + except (AttributeError, OSError): size = os.terminal_size(fallback) if columns <= 0: columns = size.columns diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py index ca1d006763..7e41891e5e 100644 --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -1837,6 +1837,8 @@ class TermsizeTests(unittest.TestCase): self.assertEqual(size.lines, 888) @unittest.skipUnless(os.isatty(sys.__stdout__.fileno()), "not on tty") + @unittest.skipUnless(hasattr(os, 'get_terminal_size'), + 'need os.get_terminal_size()') def test_stty_match(self): """Check if stty returns the same results ignoring env @@ -90,6 +90,7 @@ Matthew Barnett Richard Barran Cesar Eduardo Barros Des Barry +Emanuel Barry Ulf Bartelt Campbell Barton Don Bashford @@ -107,6 +107,10 @@ Core and Builtins Library ------- +- Issue #26801: Fix error handling in :func:`shutil.get_terminal_size`, catch + :exc:`AttributeError` instead of :exc:`NameError`. Patch written by Emanuel + Barry. + - Issue #24838: tarfile's ustar and gnu formats now correctly calculate name and link field limits for multibyte character encodings like utf-8. |