summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2016-04-19 20:24:56 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2016-04-19 20:24:56 (GMT)
commit119ebb70e9b7ae15896ced52321d626b757e7cbb (patch)
tree0afb3b2dbb9581847107b4d4f3491476cfefeeb6 /Misc
parentded4c4967b37ead4c2f897b3a0f565a02098a948 (diff)
downloadcpython-119ebb70e9b7ae15896ced52321d626b757e7cbb.zip
cpython-119ebb70e9b7ae15896ced52321d626b757e7cbb.tar.gz
cpython-119ebb70e9b7ae15896ced52321d626b757e7cbb.tar.bz2
Fix shutil.get_terminal_size() error handling
Issue #26801: Fix error handling in shutil.get_terminal_size(), catch AttributeError instead of NameError. Patch written by Emanuel Barry. test_shutil: skip the functional test using "stty size" command if os.get_terminal_size() is missing.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS4
2 files changed, 5 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index e293ddc..6c01880 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -90,6 +90,7 @@ Matthew Barnett
Richard Barran
Cesar Eduardo Barros
Des Barry
+Emanuel Barry
Ulf Bartelt
Campbell Barton
Don Bashford
diff --git a/Misc/NEWS b/Misc/NEWS
index 86caea8..0cb29ad 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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.