summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Berendt <berendt@b1-systems.de>2014-05-13 23:09:47 +0200
committerChristian Berendt <berendt@b1-systems.de>2014-05-13 23:12:17 +0200
commit31569163a5927c97c6286157aecf83a7b4ce945b (patch)
treef16516222d67095207d1188e7428bd4aa37b2b0e
parent85857724d4c13dabe74e402a963824f65928d824 (diff)
downloadpython-troveclient-31569163a5927c97c6286157aecf83a7b4ce945b.tar.gz
fixed several pep8 issues
* E265 block comment should start with '# ' * E128 continuation line under-indented for visual indent * E713 test for membership should be 'not in' Tested with pep8 version 1.5.6 (2014-04-14). Change-Id: If2853c79bea91ebef5cd97dff66788b46b174a9a
-rw-r--r--troveclient/compat/base.py2
-rw-r--r--troveclient/compat/tests/test_common.py2
-rw-r--r--troveclient/exceptions.py2
-rw-r--r--troveclient/shell.py6
-rw-r--r--troveclient/tests/test_base.py4
-rw-r--r--troveclient/v1/client.py16
-rw-r--r--troveclient/v1/configurations.py4
7 files changed, 18 insertions, 18 deletions
diff --git a/troveclient/compat/base.py b/troveclient/compat/base.py
index 915ec71..2c4fdb0 100644
--- a/troveclient/compat/base.py
+++ b/troveclient/compat/base.py
@@ -255,7 +255,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 edd297d..b38e589 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 e5d9490..f71c573 100644
--- a/troveclient/shell.py
+++ b/troveclient/shell.py
@@ -60,7 +60,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'"
@@ -388,7 +388,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):
@@ -451,7 +451,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 5679cc0..52c7b85 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 becb41b..26fb847 100644
--- a/troveclient/v1/client.py
+++ b/troveclient/v1/client.py
@@ -68,14 +68,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 61c890e..5d43211 100644
--- a/troveclient/v1/configurations.py
+++ b/troveclient/v1/configurations.py
@@ -151,7 +151,7 @@ class ConfigurationParameters(base.ManagerWithFind):
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):
"""
@@ -165,7 +165,7 @@ class ConfigurationParameters(base.ManagerWithFind):
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):