openstack/python-troveclient
Code Issues Proposed changes

Merge "fixed several pep8 issues"

Browse Source
This commit is contained in:
Jenkins
2014-05-28 01:26:28 +00:00
committed by Gerrit Code Review
parent 21646a49dc 31569163a5
commit 9844f4dcdc
7 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
troveclient/compat/base.py
View File

@@ -251,7 +251,7 @@ class Resource(object):
def __getattr__(self, k): def __getattr__(self, k):
if k not in self.__dict__: 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(): if not self.is_loaded():
self.get() self.get()
return self.__getattr__(k) return self.__getattr__(k)

2
troveclient/compat/tests/test_common.py
View File

@@ -54,7 +54,7 @@ class CommonTest(testtools.TestCase):
status = [400, 422, 500] status = [400, 422, 500]
for s in status: for s in status:
resp = mock.Mock() resp = mock.Mock()
#compat still uses status # compat still uses status
resp.status = s resp.status = s
self.assertRaises(Exception, self.assertRaises(Exception,
common.check_for_exceptions, resp, "body") common.check_for_exceptions, resp, "body")

2
troveclient/exceptions.py
View File

@@ -19,7 +19,7 @@
Exception definitions Exception definitions
""" """
#flake8: noqa # flake8: noqa
# alias exceptions from apiclient for users of this module # alias exceptions from apiclient for users of this module
from troveclient.openstack.common.apiclient.exceptions import * from troveclient.openstack.common.apiclient.exceptions import *

6
troveclient/shell.py
View File

@@ -61,7 +61,7 @@ class TroveClientArgumentParser(argparse.ArgumentParser):
exits. exits.
""" """
self.print_usage(sys.stderr) 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' choose_from = ' (choose from'
progparts = self.prog.partition(' ') progparts = self.prog.partition(' ')
self.exit(2, "error: %(errmsg)s\nTry '%(mainp)s help %(subp)s'" 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 = DEFAULT_TROVE_SERVICE_TYPE
service_type = utils.get_service_type(args.func) or 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. # for os_username or os_password but for compatibility it is not.
if not utils.isunauthenticated(args.func): if not utils.isunauthenticated(args.func):
@@ -452,7 +452,7 @@ class OpenStackTroveShell(object):
"Change its value via either --os-database-api-version " "Change its value via either --os-database-api-version "
"or env[OS_DATABASE_API_VERSION]") "or env[OS_DATABASE_API_VERSION]")
% (options.os_database_api_version, endpoint_api_version)) % (options.os_database_api_version, endpoint_api_version))
#raise exc.InvalidAPIVersion(msg) # raise exc.InvalidAPIVersion(msg)
raise exc.UnsupportedVersion(msg) raise exc.UnsupportedVersion(msg)
# Override printing to json output # Override printing to json output

4
troveclient/tests/test_base.py
View File

@@ -455,8 +455,8 @@ class ResourceTest(testtools.TestCase):
robj._add_details(info_) robj._add_details(info_)
self.assertEqual(info_["test_attr"], robj.__getattr__("test_attr")) self.assertEqual(info_["test_attr"], robj.__getattr__("test_attr"))
#TODO(dmakogon): looks like causing infinite recursive calls # TODO(dmakogon): looks like causing infinite recursive calls
#robj.__getattr__("test_non_exist_attr") # robj.__getattr__("test_non_exist_attr")
def test___repr__(self): def test___repr__(self):
robj = self.get_mock_resource_obj() robj = self.get_mock_resource_obj()

16
troveclient/v1/client.py
View File

@@ -67,14 +67,14 @@ class Client(object):
config_parameters = configurations.ConfigurationParameters(self) config_parameters = configurations.ConfigurationParameters(self)
self.configuration_parameters = config_parameters self.configuration_parameters = config_parameters
#self.hosts = Hosts(self) # self.hosts = Hosts(self)
#self.quota = Quotas(self) # self.quota = Quotas(self)
#self.storage = StorageInfo(self) # self.storage = StorageInfo(self)
#self.management = Management(self) # self.management = Management(self)
#self.mgmt_flavor = MgmtFlavors(self) # self.mgmt_flavor = MgmtFlavors(self)
#self.accounts = Accounts(self) # self.accounts = Accounts(self)
#self.diagnostics = DiagnosticsInterrogator(self) # self.diagnostics = DiagnosticsInterrogator(self)
#self.hwinfo = HwInfoInterrogator(self) # self.hwinfo = HwInfoInterrogator(self)
# Add in any extensions... # Add in any extensions...
if extensions: if extensions:

4
troveclient/v1/configurations.py
View File

@@ -129,7 +129,7 @@ class ConfigurationParameters(base.ManagerWithFind):
def get_parameter(self, datastore, version, key): def get_parameter(self, datastore, version, key):
"""Get a list of valid parameters that can be changed.""" """Get a list of valid parameters that can be changed."""
return self._get("/datastores/%s/versions/%s/parameters/%s" % return self._get("/datastores/%s/versions/%s/parameters/%s" %
(datastore, version, key)) (datastore, version, key))
def parameters_by_version(self, version): def parameters_by_version(self, version):
"""Get a list of valid parameters that can be changed.""" """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): def get_parameter_by_version(self, version, key):
"""Get a list of valid parameters that can be changed.""" """Get a list of valid parameters that can be changed."""
return self._get("/datastores/versions/%s/parameters/%s" % return self._get("/datastores/versions/%s/parameters/%s" %
(version, key)) (version, key))
# Appease the abc gods # Appease the abc gods
def list(self): def list(self):