Merge "fixed several pep8 issues"

7 files changed, 18 insertions, 18 deletions

diff --git a/troveclient/compat/base.py b/troveclient/compat/base.py
index b83e746..e47c6da 100644
--- a/troveclient/compat/base.py
+++ b/troveclient/compat/base.py
@@ -251,7 +251,7 @@ class Resource(object):
 
     def __getattr__(self, k):
         if k not in self.__dict__:
-            #NOTE(bcwaldon): disallow lazy-loading if already loaded once
+            # NOTE(bcwaldon): disallow lazy-loading if already loaded once
             if not self.is_loaded():
                 self.get()
                 return self.__getattr__(k)
diff --git a/troveclient/compat/tests/test_common.py b/troveclient/compat/tests/test_common.py
index 53ed30f..0613417 100644
--- a/troveclient/compat/tests/test_common.py
+++ b/troveclient/compat/tests/test_common.py
@@ -54,7 +54,7 @@ class CommonTest(testtools.TestCase):
         status = [400, 422, 500]
         for s in status:
             resp = mock.Mock()
-            #compat still uses status
+            # compat still uses status
             resp.status = s
             self.assertRaises(Exception,
                               common.check_for_exceptions, resp, "body")
diff --git a/troveclient/exceptions.py b/troveclient/exceptions.py
index cb9a39c..0f205a2 100644
--- a/troveclient/exceptions.py
+++ b/troveclient/exceptions.py
@@ -19,7 +19,7 @@
 Exception definitions
 """
 
-#flake8: noqa
+# flake8: noqa
 # alias exceptions from apiclient for users of this module
 from troveclient.openstack.common.apiclient.exceptions import *
 
diff --git a/troveclient/shell.py b/troveclient/shell.py
index 4a18357..46bbf2d 100644
--- a/troveclient/shell.py
+++ b/troveclient/shell.py
@@ -61,7 +61,7 @@ class TroveClientArgumentParser(argparse.ArgumentParser):
         exits.
         """
         self.print_usage(sys.stderr)
-        #FIXME(lzyeval): if changes occur in argparse.ArgParser._check_value
+        # FIXME(lzyeval): if changes occur in argparse.ArgParser._check_value
         choose_from = ' (choose from'
         progparts = self.prog.partition(' ')
         self.exit(2, "error: %(errmsg)s\nTry '%(mainp)s help %(subp)s'"
@@ -389,7 +389,7 @@ class OpenStackTroveShell(object):
             service_type = DEFAULT_TROVE_SERVICE_TYPE
             service_type = utils.get_service_type(args.func) or service_type
 
-        #FIXME(usrleon): Here should be restrict for project id same as
+        # FIXME(usrleon): Here should be restrict for project id same as
         # for os_username or os_password but for compatibility it is not.
 
         if not utils.isunauthenticated(args.func):
@@ -452,7 +452,7 @@ class OpenStackTroveShell(object):
                     "Change its value via either --os-database-api-version "
                     "or env[OS_DATABASE_API_VERSION]")
                    % (options.os_database_api_version, endpoint_api_version))
-            #raise exc.InvalidAPIVersion(msg)
+            # raise exc.InvalidAPIVersion(msg)
             raise exc.UnsupportedVersion(msg)
 
         # Override printing to json output
diff --git a/troveclient/tests/test_base.py b/troveclient/tests/test_base.py
index b7732e9..d56cbbc 100644
--- a/troveclient/tests/test_base.py
+++ b/troveclient/tests/test_base.py
@@ -455,8 +455,8 @@ class ResourceTest(testtools.TestCase):
         robj._add_details(info_)
         self.assertEqual(info_["test_attr"], robj.__getattr__("test_attr"))
 
-        #TODO(dmakogon): looks like causing infinite recursive calls
-        #robj.__getattr__("test_non_exist_attr")
+        # TODO(dmakogon): looks like causing infinite recursive calls
+        # robj.__getattr__("test_non_exist_attr")
 
     def test___repr__(self):
         robj = self.get_mock_resource_obj()
diff --git a/troveclient/v1/client.py b/troveclient/v1/client.py
index 75972bc..2de68fa 100644
--- a/troveclient/v1/client.py
+++ b/troveclient/v1/client.py
@@ -67,14 +67,14 @@ class Client(object):
         config_parameters = configurations.ConfigurationParameters(self)
         self.configuration_parameters = config_parameters
 
-        #self.hosts = Hosts(self)
-        #self.quota = Quotas(self)
-        #self.storage = StorageInfo(self)
-        #self.management = Management(self)
-        #self.mgmt_flavor = MgmtFlavors(self)
-        #self.accounts = Accounts(self)
-        #self.diagnostics = DiagnosticsInterrogator(self)
-        #self.hwinfo = HwInfoInterrogator(self)
+        # self.hosts = Hosts(self)
+        # self.quota = Quotas(self)
+        # self.storage = StorageInfo(self)
+        # self.management = Management(self)
+        # self.mgmt_flavor = MgmtFlavors(self)
+        # self.accounts = Accounts(self)
+        # self.diagnostics = DiagnosticsInterrogator(self)
+        # self.hwinfo = HwInfoInterrogator(self)
 
         # Add in any extensions...
         if extensions:
diff --git a/troveclient/v1/configurations.py b/troveclient/v1/configurations.py
index 7874424..89db490 100644
--- a/troveclient/v1/configurations.py
+++ b/troveclient/v1/configurations.py
@@ -129,7 +129,7 @@ class ConfigurationParameters(base.ManagerWithFind):
     def get_parameter(self, datastore, version, key):
         """Get a list of valid parameters that can be changed."""
         return self._get("/datastores/%s/versions/%s/parameters/%s" %
-                        (datastore, version, key))
+                         (datastore, version, key))
 
     def parameters_by_version(self, version):
         """Get a list of valid parameters that can be changed."""
@@ -139,7 +139,7 @@ class ConfigurationParameters(base.ManagerWithFind):
     def get_parameter_by_version(self, version, key):
         """Get a list of valid parameters that can be changed."""
         return self._get("/datastores/versions/%s/parameters/%s" %
-                        (version, key))
+                         (version, key))
 
     # Appease the abc gods
     def list(self):