Update checked in version of gsutil to version 4.6

gslib/addlhelp/dev.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 contributing code to 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>
   We're open to incorporating gsutil code changes authored by users. Here
   are some guidelines:
 
   1. Before we can accept code submissions, we have to jump a couple of legal
      hurdles. Please fill out either the individual or corporate Contributor
      License Agreement:
 
      - If you are an individual writing original source code and you're
        sure you own the intellectual property,
@@ skipping 93 matching lines @@
         http://code.google.com/p/rietveld/wiki/UploadPyUsage
       - Run upload.py from your git directory with the changes.
       - Click the codereview.appspot.com link it generates, click "Edit Issue",
         and add mfschwartz@google.com as a reviewer, and Cc gs-team@google.com.
       - Click Publish+Mail Comments.
       - Once your changes are accepted, submit a pull request on GitHub and we
         will merge your commits.
 """)
 
 
-
 class CommandOptions(HelpProvider):
   """Additional help about contributing code to gsutil."""
+  # TODO: gsutil-beta: Add lint .rc file and linting instructions.
 
-  help_spec = {
-    # Name of command or auxiliary help info for which this help applies.
-    HELP_NAME : 'dev',
-    # List of help name aliases.
-    HELP_NAME_ALIASES : ['development', 'developer', 'code', 'mods',
-                         'software'],
-    # Type of help:
-    HELP_TYPE : HelpType.ADDITIONAL_HELP,
-    # One line summary of this help.
-    HELP_ONE_LINE_SUMMARY : 'Contributing Code to gsutil',
-    # The full help text.
-    HELP_TEXT : _detailed_help_text,
-  }
+  # Help specification. See help_provider.py for documentation.
+  help_spec = HelpProvider.HelpSpec(
+      help_name='dev',
+      help_name_aliases=[
+          'development', 'developer', 'code', 'mods', 'software'],
+      help_type='additional_help',
+      help_one_line_summary='Contributing Code to gsutil',
+      help_text=_DETAILED_HELP_TEXT,
+      subcommand_help_text={},
+  )