Fix all but H302 hacking rules.

Change-Id: Iac329617428b851df42579d5bd0b299d2f6e2c0a

heatclient/common/base.py

@@ -29,7 +29,8 @@ except NameError:
 
 
 def getid(obj):
-    """
+    """Get by object or ID.
+
     Abstracts the common pattern of allowing both an object or an object's ID
     (UUID) as a parameter when dealing with relationships.
     """
@@ -40,9 +41,10 @@ def getid(obj):
 
 
 class Manager(object):
-    """
+    """Managers interact with a particular type of API.
-    Managers interact with a particular type of API (servers, flavors, images,
+
-    etc.) and provide CRUD operations for them.
+    For example servers, flavors and images.
+    It provides CRUD operations for these objects.
     """
     resource_class = None
 
@@ -69,9 +71,9 @@ class Manager(object):
 
 
 class Resource(object):
-    """
+    """A resource represents a particular instance of an object.
-    A resource represents a particular instance of an object (tenant, user,
+
-    etc). This is pretty much just a bag for attributes.
+    For example tenant or user. This is pretty much just a bag for attributes.
 
     :param manager: Manager object
     :param info: dictionary representing resource attributes

heatclient/common/http.py

@@ -227,8 +227,7 @@ class VerifiedHTTPSConnection(httplib.HTTPSConnection):
         self.insecure = insecure
 
     def connect(self):
-        """
+        """Connect to a host on a given (SSL) port.
-        Connect to a host on a given (SSL) port.
         If ca_file is pointing somewhere, use it to check Server Certificate.
 
         Redefined/copied and extended from httplib.py:1105 (Python 2.6.x).

heatclient/common/utils.py

@@ -124,9 +124,7 @@ def exit(msg=''):
 
 
 def format_parameters(params):
-    '''
+    '''Reformat parameters into dict of format expected by the API.'''
-    Reformat parameters into dict of format expected by the API
-    '''
     parameters = {}
     if params:
         for count, p in enumerate(params.split(';'), 1):

heatclient/shell.py

@@ -322,9 +322,7 @@ class HeatShell(object):
     @utils.arg('command', metavar='<subcommand>', nargs='?',
                help='Display help for <subcommand>')
     def do_help(self, args):
-        """
+        """Display help about this program or one of its subcommands."""
-        Display help about this program or one of its subcommands.
-        """
         if getattr(args, 'command', None):
             if args.command in self.subcommands:
                 self.subcommands[args.command].print_help()

heatclient/tests/test_common_http.py

@@ -1,9 +1,9 @@
 import mox
 import testtools
 
-import fakes
 from heatclient.common import http
 from heatclient import exc
+from heatclient.tests import fakes
 
 
 class HttpClientTest(testtools.TestCase):

heatclient/tests/test_shell.py

@@ -14,9 +14,9 @@ except ImportError:
     import simplejson as json
 from keystoneclient.v2_0 import client as ksclient
 
-import fakes
 from heatclient import exc
 import heatclient.shell
+from heatclient.tests import fakes
 from heatclient.v1 import client as v1client
 
 load_tests = testscenarios.load_tests_apply_scenarios

tox.ini

@@ -22,6 +22,6 @@ downloadcache = ~/cache/pip
 
 [flake8]
 show-source = True
-ignore = H302,H303,H304,H403,H404
+ignore = H302
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build