Update checked in version of gsutil to version 4.6

gslib/addlhelp/subdirs.py

+# -*- coding: utf-8 -*-
 # Copyright 2012 Google Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+"""Additional help about subdirectory handling in gsutil."""
 
-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 __future__ import absolute_import
+
 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
 
-_detailed_help_text = ("""
+_DETAILED_HELP_TEXT = ("""
 <B>OVERVIEW</B>
   This section provides details about how subdirectories work in gsutil.
   Most users probably don't need to know these details, and can simply use
   the commands (like cp -R) that work with subdirectories. We provide this
   additional documentation to help users understand how gsutil handles
   subdirectories differently than most GUI / web-based tools (e.g., why
   those other tools create "dir_$folder$" objects), and also to explain cost and
   performance implications of the gsutil approach, for those interested in such
   details.
 
@@ skipping 61 matching lines @@
   limit result data. Moreover, gsutil makes only one bucket listing request
   per cp/mv command, and thus amortizes the bucket listing cost across all
   transferred objects (e.g., when performing a recursive copy of a directory
   to the cloud).
 """)
 
 
 class CommandOptions(HelpProvider):
   """Additional help about subdirectory handling in gsutil."""
 
-  help_spec = {
-    # Name of command or auxiliary help info for which this help applies.
-    HELP_NAME : 'subdirs',
-    # List of help name aliases.
-    HELP_NAME_ALIASES : ['dirs', 'directory', 'directories', 'folder',
-                         'folders', 'hierarchy', 'subdir', 'subdirectory',
-                         'subdirectories'],
-    # Type of help:
-    HELP_TYPE : HelpType.ADDITIONAL_HELP,
-    # One line summary of this help.
-    HELP_ONE_LINE_SUMMARY : 'How Subdirectories Work',
-    # The full help text.
-    HELP_TEXT : _detailed_help_text,
-  }
+  # Help specification. See help_provider.py for documentation.
+  help_spec = HelpProvider.HelpSpec(
+      help_name='subdirs',
+      help_name_aliases=[
+          'dirs', 'directory', 'directories', 'folder', 'folders', 'hierarchy',
+          'subdir', 'subdirectory', 'subdirectories'],
+      help_type='additional_help',
+      help_one_line_summary='How Subdirectories Work',
+      help_text=_DETAILED_HELP_TEXT,
+      subcommand_help_text={},
+  )