From 64a19e89f4691d2662cdd46a3cf954d03c0acb31 Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Wed, 15 Jan 2014 17:31:12 +0100 Subject: [PATCH] Keystoneclient supports Py3K now Change-Id: Iddc9ff109ebf1a5c1629136df53374ab4a8d7c59 --- marconiclient/auth/__init__.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/marconiclient/auth/__init__.py b/marconiclient/auth/__init__.py index e29ad73b..faf30ec3 100644 --- a/marconiclient/auth/__init__.py +++ b/marconiclient/auth/__init__.py @@ -14,24 +14,14 @@ # limitations under the License. -import six - from marconiclient.auth import base - -if not six.PY3: - from marconiclient.auth import keystone -else: - keystone = None - # NOTE(flaper87): Replace with logging - print('Keystone auth does not support Py3K') +from marconiclient.auth import keystone _BACKENDS = { 'noauth': base.NoAuth, + 'keystone': keystone.KeystoneAuth } -if keystone: - _BACKENDS['keystone'] = keystone.KeystoneAuth - def get_backend(backend='noauth', options=None): """Loads backend `auth_backend`