From 74102c9a5f2327c4fc47feefa072854a53551d1f Mon Sep 17 00:00:00 2001
From: Berker Peksag <berker.peksag@gmail.com>
Date: Wed, 25 Jul 2018 18:23:44 +0300
Subject: bpo-13041: Use shutil.get_terminal_size() in argparse.HelpFormatter
 (GH-8459)

---
 Lib/argparse.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'Lib/argparse.py')

diff --git a/Lib/argparse.py b/Lib/argparse.py
index a030749247..83f47e35a7 100644
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -85,6 +85,7 @@ __all__ = [
 
 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 @@ class HelpFormatter(object):
 
         # 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
-- 
cgit v1.2.1