Backslash continuations (Keystone)
Fixes bug #940010 Didn't fix SQLAlchemy queries. Module keystone/middleware/auth_token.py is fixed in https://review.openstack.org/#change,4385 Change-Id: Idaad992b5ef493407a23f0f77110ed2ab3f2452e
This commit is contained in:
parent
17ffe7a97e
commit
036b99086c
|
@ -32,8 +32,9 @@ def create_server(conf, name, port):
|
|||
|
||||
def serve(*servers):
|
||||
for server in servers:
|
||||
logging.debug("starting server %s on port %s", server.application,
|
||||
server.port)
|
||||
logging.debug("starting server %s on port %s",
|
||||
server.application,
|
||||
server.port)
|
||||
server.start()
|
||||
|
||||
for server in servers:
|
||||
|
@ -45,8 +46,8 @@ def serve(*servers):
|
|||
|
||||
if __name__ == '__main__':
|
||||
dev_conf = os.path.join(possible_topdir,
|
||||
'etc',
|
||||
'keystone.conf')
|
||||
'etc',
|
||||
'keystone.conf')
|
||||
config_files = None
|
||||
if os.path.exists(dev_conf):
|
||||
config_files = [dev_conf]
|
||||
|
|
|
@ -32,8 +32,8 @@ from urllib import quote
|
|||
import logging
|
||||
import time
|
||||
|
||||
from eventlet.green.httplib import CONTINUE, HTTPConnection, HTTPMessage, \
|
||||
HTTPResponse, HTTPSConnection, _UNKNOWN
|
||||
from eventlet.green.httplib import (CONTINUE, HTTPConnection, HTTPMessage,
|
||||
HTTPResponse, HTTPSConnection, _UNKNOWN)
|
||||
|
||||
|
||||
class BufferedHTTPResponse(HTTPResponse):
|
||||
|
|
|
@ -60,7 +60,7 @@ class Server(object):
|
|||
|
||||
def start(self, host='0.0.0.0', key=None, backlog=128):
|
||||
"""Run a WSGI server with the given application."""
|
||||
logging.debug('Starting %(arg0)s on %(host)s:%(port)s' % \
|
||||
logging.debug('Starting %(arg0)s on %(host)s:%(port)s' %
|
||||
{'arg0': sys.argv[0],
|
||||
'host': host,
|
||||
'port': self.port})
|
||||
|
|
|
@ -229,11 +229,11 @@ class TokenController(wsgi.Application):
|
|||
tenant_id = tenant_ref['id']
|
||||
|
||||
try:
|
||||
(user_ref, tenant_ref, metadata_ref) = \
|
||||
self.identity_api.authenticate(context=context,
|
||||
user_id=user_id,
|
||||
password=password,
|
||||
tenant_id=tenant_id)
|
||||
auth_info = self.identity_api.authenticate(context=context,
|
||||
user_id=user_id,
|
||||
password=password,
|
||||
tenant_id=tenant_id)
|
||||
(user_ref, tenant_ref, metadata_ref) = auth_info
|
||||
|
||||
# If the user is disabled don't allow them to authenticate
|
||||
if not user_ref.get('enabled', True):
|
||||
|
|
|
@ -124,9 +124,9 @@ class _Win32Colorizer(object):
|
|||
See _AnsiColorizer docstring.
|
||||
"""
|
||||
def __init__(self, stream):
|
||||
from win32console import GetStdHandle, STD_OUT_HANDLE, \
|
||||
FOREGROUND_RED, FOREGROUND_BLUE, FOREGROUND_GREEN, \
|
||||
FOREGROUND_INTENSITY
|
||||
from win32console import (GetStdHandle, STD_OUT_HANDLE,
|
||||
FOREGROUND_RED, FOREGROUND_GREEN,
|
||||
FOREGROUND_BLUE, FOREGROUND_INTENSITY)
|
||||
red, green, blue, bold = (FOREGROUND_RED, FOREGROUND_GREEN,
|
||||
FOREGROUND_BLUE, FOREGROUND_INTENSITY)
|
||||
self.stream = stream
|
||||
|
|
Loading…
Reference in New Issue