diff options
| author |   Victor Stinner <victor.stinner@gmail.com> | 2016-04-19 22:24:56 +0200 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2016-04-19 22:24:56 +0200 |
| commit | 119ebb70e9b7ae15896ced52321d626b757e7cbb (patch) | |
| tree | 0afb3b2dbb9581847107b4d4f3491476cfefeeb6 /Lib/shutil.py | |
| parent | Trivial typo (diff) | |
| download | cpython-119ebb70e9b7ae15896ced52321d626b757e7cbb.tar.gz cpython-119ebb70e9b7ae15896ced52321d626b757e7cbb.tar.bz2 cpython-119ebb70e9b7ae15896ced52321d626b757e7cbb.zip | |
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 'Lib/shutil.py')
| -rw-r--r-- | Lib/shutil.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/shutil.py b/Lib/shutil.py index 3f4b6bf663f..7f8edf5e5a3 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 |