openstack
/
keystone
Code Issues Proposed changes

Various pep8 fixes for keystone. 

Change-Id: Id94b76d30658e75a805301b1c30b1aa28138b823
This commit is contained in:
Dan Prince 2012-11-09 13:57:53 -05:00
parent 3576cbb9ea
commit 8dcafd81df
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/keystone-all
View File

@ -69,7 +69,6 @@ def serve(*servers):
pass
if __name__ == '__main__':
dev_conf = os.path.join(possible_topdir,
'etc',

2
httpd/keystone.py
View File

@ -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__)

2
keystone/common/ldap/core.py
View File

@ -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

2
tests/test_s3_token_middleware.py
View File

@ -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)