diff options
| author | Zhongyue Luo <lzyeval@gmail.com> | 2012-02-24 10:38:45 +0800 |
|---|---|---|
| committer | Zhongyue Luo <lzyeval@gmail.com> | 2012-02-24 10:50:02 +0800 |
| commit | 036b99086c170418b4fa54bc51c1c632eb420506 (patch) | |
| tree | 7d66aabfbf2252d26fae56a23f665dc3debf1ee6 | |
| parent | 17ffe7a97ee6490b9ee1fd3ecc62d0167710e40b (diff) | |
| download | keystone-036b99086c170418b4fa54bc51c1c632eb420506.tar.gz keystone-036b99086c170418b4fa54bc51c1c632eb420506.tar.xz keystone-036b99086c170418b4fa54bc51c1c632eb420506.zip | |
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
| -rwxr-xr-x | bin/keystone-all | 9 | ||||
| -rw-r--r-- | keystone/common/bufferedhttp.py | 4 | ||||
| -rw-r--r-- | keystone/common/wsgi.py | 2 | ||||
| -rw-r--r-- | keystone/service.py | 10 | ||||
| -rw-r--r-- | run_tests.py | 6 |
5 files changed, 16 insertions, 15 deletions
diff --git a/bin/keystone-all b/bin/keystone-all index 1402b92d..5dddd147 100755 --- a/bin/keystone-all +++ b/bin/keystone-all @@ -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] diff --git a/keystone/common/bufferedhttp.py b/keystone/common/bufferedhttp.py index 5425dcc5..aeee7510 100644 --- a/keystone/common/bufferedhttp.py +++ b/keystone/common/bufferedhttp.py @@ -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): diff --git a/keystone/common/wsgi.py b/keystone/common/wsgi.py index 89be1128..496288e5 100644 --- a/keystone/common/wsgi.py +++ b/keystone/common/wsgi.py @@ -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}) diff --git a/keystone/service.py b/keystone/service.py index 2029514d..679a41d7 100644 --- a/keystone/service.py +++ b/keystone/service.py @@ -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): diff --git a/run_tests.py b/run_tests.py index 2aff22c1..554cdd6a 100644 --- a/run_tests.py +++ b/run_tests.py @@ -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 |