diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2016-04-19 20:29:11 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2016-04-19 20:29:11 (GMT) |
| commit | 5bfe0da80840bf6a0edcf7be2482ac584125ede1 (patch) | |
| tree | e9d7b6f6003f251e318e10170f22882d68c614f9 /Lib/shutil.py | |
| parent | 0fea25af4805ba132c0af2720dcf87c53ad43fdf (diff) | |
| parent | 119ebb70e9b7ae15896ced52321d626b757e7cbb (diff) | |
| download | cpython-5bfe0da80840bf6a0edcf7be2482ac584125ede1.zip cpython-5bfe0da80840bf6a0edcf7be2482ac584125ede1.tar.gz cpython-5bfe0da80840bf6a0edcf7be2482ac584125ede1.tar.bz2 | |
Merge 3.5: issue #26801
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 f47a763..ca6c47f 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -1072,7 +1072,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 |