Update checked in version of gsutil to version 4.6

gslib/addlhelp/support.py

Index: gslib/addlhelp/support.py
===================================================================
--- gslib/addlhelp/support.py	(revision 33376)
+++ gslib/addlhelp/support.py	(working copy)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2012 Google Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,16 +12,13 @@
 # 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 technical and billing support."""
 
-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>TECHNICAL SUPPORT</B>
   If you have any questions or encounter any problems with Google Cloud Storage,
   please first read the `FAQ <https://developers.google.com/storage/docs/faq>`_.
@@ -54,8 +52,8 @@
   header with authentication credentials for your Google Cloud Storage account.
   Make sure to remove any "Authorization:" headers before you post HTTP details
   to the forum. Note also that if you upload files large enough to use resumable
-  uploads, the resumable upload IDs are security-sensitive while an upload is
-  not yet complete, so should not be posted on public forums.
+  uploads, the resumable upload IDs are security-sensitive while an upload
+  is not yet complete, so should not be posted on public forums.
 
   If you make any local modifications to gsutil, please make sure to use
   a released copy of gsutil (instead of your locally modified copy) when
@@ -67,28 +65,25 @@
 <B>BILLING AND ACCOUNT QUESTIONS</B>
   For questions about billing or account issues, please visit
   https://developers.google.com/storage/docs/pricing-and-terms.
-  If you want to cancel billing, visit the
-  `Google Cloud Console<https://cloud.google.com/console#/project>`_, click on
-  the project you're using, click the gear in the upper right corner, and select
-  "Billing" from the drop-down. Caution: When you disable billing, you also
-  disable the Google Cloud Storage service. Make sure you want to disable the
-  Google Cloud Storage service before you disable billing.
+  If you want to cancel billing, follow the instructions at
+  `Google Developers Console<https://developers.google.com/console/help/billing>`
+  Caution: When you disable billing, you also disable the Google Cloud Storage
+  service. Make sure you want to disable the Google Cloud Storage service
+  before you disable billing.
 """)
 
 
 class CommandOptions(HelpProvider):
-  """Additional help about tech and billing support."""
+  """Additional help about technical and billing support."""
 
-  help_spec = {
-    # Name of command or auxiliary help info for which this help applies.
-    HELP_NAME : 'support',
-    # List of help name aliases.
-    HELP_NAME_ALIASES : ['techsupport', 'tech support', 'technical support',
-                         'billing', 'faq', 'questions'],
-    # Type of help:
-    HELP_TYPE : HelpType.ADDITIONAL_HELP,
-    # One line summary of this help.
-    HELP_ONE_LINE_SUMMARY : 'Google Cloud Storage Support',
-    # The full help text.
-    HELP_TEXT : _detailed_help_text,
-  }
+  # Help specification. See help_provider.py for documentation.
+  help_spec = HelpProvider.HelpSpec(
+      help_name='support',
+      help_name_aliases=[
+          'techsupport', 'tech support', 'technical support', 'billing', 'faq',
+          'questions'],
+      help_type='additional_help',
+      help_one_line_summary='Google Cloud Storage Support',
+      help_text=_DETAILED_HELP_TEXT,
+      subcommand_help_text={},
+  )