Update checked in version of gsutil to version 4.6

gslib/commands/help.py

Index: gslib/commands/help.py
===================================================================
--- gslib/commands/help.py	(revision 33376)
+++ gslib/commands/help.py	(working copy)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2011 Google Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,41 +12,27 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+"""Implementation of gsutil help command."""
 
+from __future__ import absolute_import
+
 import itertools
 import os
 import pkgutil
 import re
-import struct
 from subprocess import PIPE
 from subprocess import Popen
 
-import gslib.commands
 import gslib.addlhelp
 from gslib.command import Command
-from gslib.command import COMMAND_NAME
-from gslib.command import COMMAND_NAME_ALIASES
-from gslib.command import FILE_URIS_OK
-from gslib.command import MAX_ARGS
-from gslib.command import MIN_ARGS
 from gslib.command import OLD_ALIAS_MAP
-from gslib.command import PROVIDER_URIS_OK
-from gslib.command import SUPPORTED_SUB_ARGS
-from gslib.command import URIS_START_ARG
+import gslib.commands
 from gslib.exception import CommandException
-from gslib.help_provider import ALL_HELP_TYPES
-from gslib.help_provider import HELP_NAME
-from gslib.help_provider import HELP_NAME_ALIASES
-from gslib.help_provider import HELP_ONE_LINE_SUMMARY
 from gslib.help_provider import HelpProvider
-from gslib.help_provider import HELP_TEXT
-from gslib.help_provider import HelpType
-from gslib.help_provider import HELP_TYPE
 from gslib.help_provider import MAX_HELP_NAME_LEN
-from gslib.help_provider import SUBCOMMAND_HELP_TEXT
 from gslib.util import IsRunningInteractively
 
-_detailed_help_text = ("""
+_DETAILED_HELP_TEXT = ("""
 <B>SYNOPSIS</B>
   gsutil help [command or topic]
 
@@ -80,60 +67,53 @@
 """)
 
 top_level_usage_string = (
-    "Usage: gsutil [-d][-D] [-h header]... [-m] [command [opts...] args...] [-q]"
+    'Usage: gsutil [-D] [-DD] [-h header]... '
+    '[-m] [-o] [-q] [command [opts...] args...]'
 )
 
+
 class HelpCommand(Command):
   """Implementation of gsutil help command."""
 
-  # Command specification (processed by parent class).
-  command_spec = {
-    # Name of command.
-    COMMAND_NAME : 'help',
-    # List of command name aliases.
-    COMMAND_NAME_ALIASES : ['?', 'man'],
-    # Min number of args required by this command.
-    MIN_ARGS : 0,
-    # Max number of args required by this command, or NO_MAX.
-    MAX_ARGS : 2,
-    # Getopt-style string specifying acceptable sub args.
-    SUPPORTED_SUB_ARGS : '',
-    # True if file URIs acceptable for this command.
-    FILE_URIS_OK : True,
-    # True if provider-only URIs acceptable for this command.
-    PROVIDER_URIS_OK : False,
-    # Index in args of first URI arg.
-    URIS_START_ARG : 0,
-  }
-  help_spec = {
-    # Name of command or auxiliary help info for which this help applies.
-    HELP_NAME : 'help',
-    # List of help name aliases.
-    HELP_NAME_ALIASES : ['?'],
-    # Type of help:
-    HELP_TYPE : HelpType.COMMAND_HELP,
-    # One line summary of this help.
-    HELP_ONE_LINE_SUMMARY : 'Get help about commands and topics',
-    # The full help text.
-    HELP_TEXT : _detailed_help_text,
-  }
+  # Command specification. See base class for documentation.
+  command_spec = Command.CreateCommandSpec(
+      'help',
+      command_name_aliases=['?', 'man'],
+      min_args=0,
+      max_args=2,
+      supported_sub_args='',
+      file_url_ok=True,
+      provider_url_ok=False,
+      urls_start_arg=0,
+  )
+  # Help specification. See help_provider.py for documentation.
+  help_spec = Command.HelpSpec(
+      help_name='help',
+      help_name_aliases=['?'],
+      help_type='command_help',
+      help_one_line_summary='Get help about commands and topics',
+      help_text=_DETAILED_HELP_TEXT,
+      subcommand_help_text={},
+  )
 
-  # Command entry point.
   def RunCommand(self):
+    """Command entry point for the help command."""
     (help_type_map, help_name_map) = self._LoadHelpMaps()
     output = []
-    if not len(self.args):
+    if not self.args:
       output.append('%s\nAvailable commands:\n' % top_level_usage_string)
       format_str = '  %-' + str(MAX_HELP_NAME_LEN) + 's%s\n'
-      for help_prov in sorted(help_type_map[HelpType.COMMAND_HELP],
-                              key=lambda hp: hp.help_spec[HELP_NAME]):
-        output.append(format_str % (help_prov.help_spec[HELP_NAME],
-                                    help_prov.help_spec[HELP_ONE_LINE_SUMMARY]))
+      for help_prov in sorted(help_type_map['command_help'],
+                              key=lambda hp: hp.help_spec.help_name):
+        output.append(format_str % (
+            help_prov.help_spec.help_name,
+            help_prov.help_spec.help_one_line_summary))
       output.append('\nAdditional help topics:\n')
-      for help_prov in sorted(help_type_map[HelpType.ADDITIONAL_HELP],
-                              key=lambda hp: hp.help_spec[HELP_NAME]):
-        output.append(format_str % (help_prov.help_spec[HELP_NAME],
-                                    help_prov.help_spec[HELP_ONE_LINE_SUMMARY]))
+      for help_prov in sorted(help_type_map['additional_help'],
+                              key=lambda hp: hp.help_spec.help_name):
+        output.append(format_str % (
+            help_prov.help_spec.help_name,
+            help_prov.help_spec.help_one_line_summary))
       output.append('\nUse gsutil help <command or topic> for detailed help.')
     else:
       invalid_subcommand = False
@@ -144,7 +124,7 @@
         help_prov = help_name_map[arg]
         help_name = None
         if len(self.args) > 1:  # We also have a subcommand argument.
-          subcommand_map = help_prov.help_spec.get(SUBCOMMAND_HELP_TEXT, None)
+          subcommand_map = help_prov.help_spec.subcommand_help_text
           if subcommand_map and self.args[1] in subcommand_map:
             help_name = arg + ' ' + self.args[1]
             help_text = subcommand_map[self.args[1]]
@@ -152,28 +132,28 @@
             invalid_subcommand = True
             if not subcommand_map:
               output.append((
-                  'The "%s" command has no subcommands. You can ask for the ' +
+                  'The "%s" command has no subcommands. You can ask for the '
                   'full help by running:\n\n\tgsutil help %s\n') %
-                  (arg, arg))
+                            (arg, arg))
             else:
               subcommand_examples = []
               for subcommand in subcommand_map:
                 subcommand_examples.append(
                     '\tgsutil help %s %s' % (arg, subcommand))
               output.append(
-                  ('Subcommand "%s" does not exist for command "%s".\n' +
-                  'You can either ask for the full help about the command by ' +
-                  'running:\n\n\tgsutil help %s\n\n'
-                  'Or you can ask for help about one of the subcommands:\n\n%s'
+                  ('Subcommand "%s" does not exist for command "%s".\n'
+                   'You can either ask for the full help about the command by '
+                   'running:\n\n\tgsutil help %s\n\n'
+                   'Or you can ask for help about one of the subcommands:\n\n%s'
                   ) % (self.args[1], arg, arg, '\n'.join(subcommand_examples)))
         if not invalid_subcommand:
           if not help_name:  # No subcommand or invalid subcommand.
-            help_name = help_prov.help_spec[HELP_NAME]
-            help_text = help_prov.help_spec[HELP_TEXT]
+            help_name = help_prov.help_spec.help_name
+            help_text = help_prov.help_spec.help_text
 
           output.append('<B>NAME</B>\n')
-          output.append('  %s - %s\n' %
-                        (help_name, help_prov.help_spec[HELP_ONE_LINE_SUMMARY]))
+          output.append('  %s - %s\n' % (
+              help_name, help_prov.help_spec.help_one_line_summary))
           output.append('\n\n')
           output.append(help_text.strip('\n'))
           new_alias = OLD_ALIAS_MAP.get(arg, [None])[0]
@@ -187,65 +167,48 @@
     self._OutputHelp(''.join(output))
     return 0
 
-  def _OutputHelp(self, str):
-    """Outputs simply formatted string, paginating if long and PAGER defined and
-       output is a tty"""
+  def _OutputHelp(self, help_str):
+    """Outputs simply formatted string.
+
+    This function paginates if the string is too long, PAGER is defined, and
+    the output is a tty.
+
+    Args:
+      help_str: String to format.
+    """
     # Replace <B> and </B> with terminal formatting strings if connected to tty.
     if not IsRunningInteractively():
-      str = re.sub('<B>', '', str)
-      str = re.sub('</B>', '', str)
-      print str
+      help_str = re.sub('<B>', '', help_str)
+      help_str = re.sub('</B>', '', help_str)
+      print help_str
       return
-    str = re.sub('<B>', '\033[1m', str)
-    str = re.sub('</B>', '\033[0;0m', str)
-    num_lines = len(str.split('\n'))
-    if 'PAGER' in os.environ and num_lines >= self.getTermLines():
+    help_str = re.sub('<B>', '\033[1m', help_str)
+    help_str = re.sub('</B>', '\033[0;0m', help_str)
+    num_lines = len(help_str.split('\n'))
+    if 'PAGER' in os.environ and num_lines >= gslib.util.GetTermLines():
       # Use -r option for less to make bolding work right.
       pager = os.environ['PAGER'].split(' ')
       if pager[0].endswith('less'):
         pager.append('-r')
       try:
-        Popen(pager, stdin=PIPE).communicate(input=str)
+        Popen(pager, stdin=PIPE).communicate(input=help_str)
       except OSError, e:
         raise CommandException('Unable to open pager (%s): %s' %
-            (' '.join(pager), e))
+                               (' '.join(pager), e))
     else:
-      print str
+      print help_str
 
-  _DEFAULT_LINES = 25
+  def _LoadHelpMaps(self):
+    """Returns tuple of help type and help name.
 
-  def getTermLines(self):
-    """Returns number of terminal lines"""
-    # fcntl isn't supported in Windows.
-    try:
-      import fcntl
-      import termios
-    except ImportError:
-      return self._DEFAULT_LINES
-    def ioctl_GWINSZ(fd):
-      try:
-        return struct.unpack(
-            'hh', fcntl.ioctl(fd, termios.TIOCGWINSZ, '1234'))[0]
-      except:
-        return 0 # Failure (so will retry on different file descriptor below).
-    # Try to find a valid number of lines from termio for stdin, stdout,
-    # or stderr, in that order.
-    ioc = ioctl_GWINSZ(0) or ioctl_GWINSZ(1) or ioctl_GWINSZ(2)
-    if not ioc:
-      try:
-        fd = os.open(os.ctermid(), os.O_RDONLY)
-        ioc = ioctl_GWINSZ(fd)
-        os.close(fd)
-      except:
-        pass
-    if not ioc:
-      ioc = os.environ.get('LINES', self._DEFAULT_LINES)
-    return int(ioc)
+    help type is a dict with key: help type
+                             value: list of HelpProviders
+    help name is a dict with key: help command name or alias
+                             value: HelpProvider
 
-  def _LoadHelpMaps(self):
-    """Returns tuple (help type -> [HelpProviders],
-                      help name->HelpProvider dict,
-                     )."""
+    Returns:
+      (help type, help name)
+    """
 
     # Import all gslib.commands submodules.
     for _, module_name, _ in pkgutil.iter_modules(gslib.commands.__path__):
@@ -267,8 +230,8 @@
         # HelpProviders, like naming.py).
         continue
       gslib.help_provider.SanityCheck(help_prov, help_name_map)
-      help_name_map[help_prov.help_spec[HELP_NAME]] = help_prov
-      for help_name_aliases in help_prov.help_spec[HELP_NAME_ALIASES]:
+      help_name_map[help_prov.help_spec.help_name] = help_prov
+      for help_name_aliases in help_prov.help_spec.help_name_aliases:
         help_name_map[help_name_aliases] = help_prov
-      help_type_map[help_prov.help_spec[HELP_TYPE]].append(help_prov)
+      help_type_map[help_prov.help_spec.help_type].append(help_prov)
     return (help_type_map, help_name_map)