Update checked in version of gsutil to version 4.6

gslib/addlhelp/naming.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 gsutil object and bucket naming."""
 
-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>BUCKET NAME REQUIREMENTS</B>
   Google Cloud Storage has a single namespace, so you will not be allowed
   to create a bucket with a name already in use by another user. You can,
   however, carve out parts of the bucket name space corresponding to your
   company's domain name (see "DOMAIN NAMED BUCKETS").
 
   Bucket names must conform to standard DNS naming conventions. This is
   because a bucket name can appear in a DNS record as part of a CNAME
   redirect. In addition to meeting DNS naming requirements, Google Cloud
   Storage imposes other requirements on bucket naming. At a minimum, your
@@ skipping 134 matching lines @@
   present. If you want to create a CNAME resource record for a domain, you must
   use the Meta tag verification method or the HTML file verification method.
 
 
 """)
 
 
 class CommandOptions(HelpProvider):
   """Additional help about gsutil object and bucket naming."""
 
-  help_spec = {
-    # Name of command or auxiliary help info for which this help applies.
-    HELP_NAME : 'naming',
-    # List of help name aliases.
-    HELP_NAME_ALIASES : ['domain', 'limits', 'name', 'names'],
-    # Type of help:
-    HELP_TYPE : HelpType.ADDITIONAL_HELP,
-    # One line summary of this help.
-    HELP_ONE_LINE_SUMMARY : 'Object and Bucket Naming',
-    # The full help text.
-    HELP_TEXT : _detailed_help_text,
-  }
+  # Help specification. See help_provider.py for documentation.
+  help_spec = HelpProvider.HelpSpec(
+      help_name='naming',
+      help_name_aliases=['domain', 'limits', 'name', 'names'],
+      help_type='additional_help',
+      help_one_line_summary='Object and Bucket Naming',
+      help_text=_DETAILED_HELP_TEXT,
+      subcommand_help_text={},
+  )