Various pep8 fixes for keystone.
Change-Id: Id94b76d30658e75a805301b1c30b1aa28138b823
This commit is contained in:
parent
3576cbb9ea
commit
8dcafd81df
|
@ -69,7 +69,6 @@ def serve(*servers):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
dev_conf = os.path.join(possible_topdir,
|
dev_conf = os.path.join(possible_topdir,
|
||||||
'etc',
|
'etc',
|
||||||
|
|
|
@ -8,7 +8,7 @@ from keystone.common import logging
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
CONF = config.CONF
|
CONF = config.CONF
|
||||||
config_files = ['/etc/keystone/keystone.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]
|
conf = CONF.config_file[0]
|
||||||
name = os.path.basename(__file__)
|
name = os.path.basename(__file__)
|
||||||
|
|
|
@ -74,7 +74,7 @@ class BaseLdap(object):
|
||||||
model = None
|
model = None
|
||||||
tree_dn = None
|
tree_dn = None
|
||||||
|
|
||||||
def __init__(self, conf):
|
def __init__(self, conf):
|
||||||
self.LDAP_URL = conf.ldap.url
|
self.LDAP_URL = conf.ldap.url
|
||||||
self.LDAP_USER = conf.ldap.user
|
self.LDAP_USER = conf.ldap.user
|
||||||
self.LDAP_PASSWORD = conf.ldap.password
|
self.LDAP_PASSWORD = conf.ldap.password
|
||||||
|
|
|
@ -71,7 +71,7 @@ class FakeHTTPConnection(object):
|
||||||
if self.status == 503:
|
if self.status == 503:
|
||||||
raise Exception
|
raise Exception
|
||||||
ret = {'access': {'token': {'id': 'TOKEN_ID',
|
ret = {'access': {'token': {'id': 'TOKEN_ID',
|
||||||
'tenant': {'id': 'TENANT_ID'}}}}
|
'tenant': {'id': 'TENANT_ID'}}}}
|
||||||
body = jsonutils.dumps(ret)
|
body = jsonutils.dumps(ret)
|
||||||
status = self.status
|
status = self.status
|
||||||
self.resp = FakeHTTPResponse(status, body)
|
self.resp = FakeHTTPResponse(status, body)
|
||||||
|
|
Loading…
Reference in New Issue