openstack/zaqar
Code Issues Proposed changes

Merge "keystoneclient now supports Py3K"

Browse Source
This commit is contained in:
Jenkins 2014-03-27 18:12:06 +00:00 committed by Gerrit Code Review
commit 06667a34d4
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
marconi/queues/transport/auth.py
View File

@ -15,9 +15,6 @@
"""Middleware for handling authorization and authentication.""" """Middleware for handling authorization and authentication."""
import six
if not six.PY3:
from keystoneclient.middleware import auth_token from keystoneclient.middleware import auth_token
from marconi.openstack.common import log from marconi.openstack.common import log
@ -49,7 +46,6 @@ class KeystoneAuth(object):
return auth_token.AuthProtocol(app, conf=conf) return auth_token.AuthProtocol(app, conf=conf)
if not six.PY3:
STRATEGIES['keystone'] = KeystoneAuth STRATEGIES['keystone'] = KeystoneAuth