From 8dcafd81dfa0ccd958b614c12eee091a325ec5c4 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Fri, 9 Nov 2012 13:57:53 -0500 Subject: [PATCH] Various pep8 fixes for keystone. Change-Id: Id94b76d30658e75a805301b1c30b1aa28138b823 --- bin/keystone-all | 1 - httpd/keystone.py | 2 +- keystone/common/ldap/core.py | 2 +- tests/test_s3_token_middleware.py | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/keystone-all b/bin/keystone-all index 7724660d1d..8867f45552 100755 --- a/bin/keystone-all +++ b/bin/keystone-all @@ -69,7 +69,6 @@ def serve(*servers): pass - if __name__ == '__main__': dev_conf = os.path.join(possible_topdir, 'etc', diff --git a/httpd/keystone.py b/httpd/keystone.py index 0982cdf800..7935f56ff2 100755 --- a/httpd/keystone.py +++ b/httpd/keystone.py @@ -8,7 +8,7 @@ from keystone.common import logging LOG = logging.getLogger(__name__) CONF = config.CONF config_files = ['/etc/keystone/keystone.conf'] -CONF(project='keystone', default_config_files=config_files) +CONF(project='keystone', default_config_files=config_files) conf = CONF.config_file[0] name = os.path.basename(__file__) diff --git a/keystone/common/ldap/core.py b/keystone/common/ldap/core.py index 53e20468fa..5905b8566d 100644 --- a/keystone/common/ldap/core.py +++ b/keystone/common/ldap/core.py @@ -74,7 +74,7 @@ class BaseLdap(object): model = None tree_dn = None - def __init__(self, conf): + def __init__(self, conf): self.LDAP_URL = conf.ldap.url self.LDAP_USER = conf.ldap.user self.LDAP_PASSWORD = conf.ldap.password diff --git a/tests/test_s3_token_middleware.py b/tests/test_s3_token_middleware.py index 08d8c08aa0..d8bc215ccb 100644 --- a/tests/test_s3_token_middleware.py +++ b/tests/test_s3_token_middleware.py @@ -71,7 +71,7 @@ class FakeHTTPConnection(object): if self.status == 503: raise Exception ret = {'access': {'token': {'id': 'TOKEN_ID', - 'tenant': {'id': 'TENANT_ID'}}}} + 'tenant': {'id': 'TENANT_ID'}}}} body = jsonutils.dumps(ret) status = self.status self.resp = FakeHTTPResponse(status, body)