Update checked in version of gsutil to version 4.6

gslib/addlhelp/versions.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 object versioning."""
 
-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>
   Versioning-enabled buckets maintain an archive of objects, providing a way to
   un-delete data that you accidentally deleted, or to retrieve older versions of
   your data. You can turn versioning on or off for a bucket at any time. Turning
   versioning off leaves existing object versions in place, and simply causes the
   bucket to stop accumulating new object versions. In this case, if you upload
   to an existing object the current version is overwritten instead of creating
   a new version.
 
   Regardless of whether you have enabled versioning on a bucket, every object
@@ skipping 223 matching lines @@
 
 <B>FOR MORE INFORMATION</B>
   For more details on how to use versioning and preconditions, see
   https://developers.google.com/storage/docs/object-versioning
 """)
 
 
 class CommandOptions(HelpProvider):
   """Additional help about object versioning."""
 
-  help_spec = {
-    # Name of command or auxiliary help info for which this help applies.
-    HELP_NAME : 'versions',
-    # List of help name aliases.
-    HELP_NAME_ALIASES : ['concurrency', 'concurrency control'],
-    # Type of help:
-    HELP_TYPE : HelpType.ADDITIONAL_HELP,
-    # One line summary of this help.
-    HELP_ONE_LINE_SUMMARY : 'Object Versioning and Concurrency Control',
-    # The full help text.
-    HELP_TEXT : _detailed_help_text,
-  }
+  # Help specification. See help_provider.py for documentation.
+  help_spec = HelpProvider.HelpSpec(
+      help_name='versions',
+      help_name_aliases=['concurrency', 'concurrency control'],
+      help_type='additional_help',
+      help_one_line_summary='Object Versioning and Concurrency Control',
+      help_text=_DETAILED_HELP_TEXT,
+      subcommand_help_text={},
+  )