Defer import of shutil which only needed for help and usage (GH-17334)

diff --git a/Lib/argparse.py b/Lib/argparse.py
index 5a8eff2f4cc89334ab1db531a4f31339a6dc1d41..5d3ce2ad709f03b1d48976d4a6aa8560a52c62ed 100644 (file)
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -87,7 +87,6 @@ __all__ = [
 
 import os as _os
 import re as _re
-import shutil as _shutil
 import sys as _sys
 
 from gettext import gettext as _, ngettext
@@ -167,7 +166,8 @@ class HelpFormatter(object):
 
         # default setting for width
         if width is None:
-            width = _shutil.get_terminal_size().columns
+            import shutil
+            width = shutil.get_terminal_size().columns
             width -= 2
 
         self._prog = prog
@@ -264,7 +264,7 @@ class HelpFormatter(object):
                 invocations.append(get_invocation(subaction))
 
             # update the maximum item length
-            invocation_length = max([len(s) for s in invocations])
+            invocation_length = max(map(len, invocations))
             action_length = invocation_length + self._current_indent
             self._action_max_length = max(self._action_max_length,
                                           action_length)