openstack/python-zaqarclient
Code Issues Proposed changes

Merge "Keystoneclient supports Py3K now"

Browse Source
This commit is contained in:
Jenkins
2014-01-15 17:53:21 +00:00
committed by Gerrit Code Review
parent 4724016a95 64a19e89f4
commit 7331d2c33d
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
marconiclient/auth/__init__.py
View File

@@ -14,24 +14,14 @@
# limitations under the License. # limitations under the License.
import six
from marconiclient.auth import base from marconiclient.auth import base
from marconiclient.auth import keystone
if not six.PY3:
from marconiclient.auth import keystone
else:
keystone = None
# NOTE(flaper87): Replace with logging
print('Keystone auth does not support Py3K')
_BACKENDS = { _BACKENDS = {
'noauth': base.NoAuth, 'noauth': base.NoAuth,
'keystone': keystone.KeystoneAuth
} }
if keystone:
_BACKENDS['keystone'] = keystone.KeystoneAuth
def get_backend(backend='noauth', options=None): def get_backend(backend='noauth', options=None):
"""Loads backend `auth_backend` """Loads backend `auth_backend`