commit 74102c9a5f2327c4fc47feefa072854a53551d1f
author Berker Peksag <berker.peksag@gmail.com> Wed Jul 25 18:23:44 2018 +0300
committer GitHub <noreply@github.com> Wed Jul 25 18:23:44 2018 +0300
tree bc6ef255acbe46650c753977363c7c7c5e9d5c73
parent c0f0a7669c73c0d444851dd4c5299de2479214cc

bpo-13041: Use shutil.get_terminal_size() in argparse.HelpFormatter (GH-8459)

Lib/argparse.py

diff --git a/Lib/argparse.py b/Lib/argparse.py
index a030749..83f47e3 100644
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -85,6 +85,7 @@
 
 import os as _os
 import re as _re
+import shutil as _shutil
 import sys as _sys
 
 from gettext import gettext as _, ngettext
@@ -164,10 +165,7 @@
 
         # default setting for width
         if width is None:
-            try:
-                width = int(_os.environ['COLUMNS'])
-            except (KeyError, ValueError):
-                width = 80
+            width = _shutil.get_terminal_size().columns
             width -= 2
 
         self._prog = prog