From 24b64624c7c7a24094a086b4bfa8890e19ccff14 Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Wed, 26 Mar 2014 09:32:17 +0100 Subject: [PATCH] keystoneclient now supports Py3K Change-Id: Ia9e5ccc0ead0c808956d76023c32f518c22c2b34 --- marconi/queues/transport/auth.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/marconi/queues/transport/auth.py b/marconi/queues/transport/auth.py index afe7cbc78..faae355aa 100644 --- a/marconi/queues/transport/auth.py +++ b/marconi/queues/transport/auth.py @@ -15,10 +15,7 @@ """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 @@ -49,8 +46,7 @@ class KeystoneAuth(object): return auth_token.AuthProtocol(app, conf=conf) -if not six.PY3: - STRATEGIES['keystone'] = KeystoneAuth +STRATEGIES['keystone'] = KeystoneAuth def strategy(strategy):