Merge "Keystoneclient supports Py3K now"

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')
 
 _BACKENDS = {
     'noauth': base.NoAuth,
+    'keystone': keystone.KeystoneAuth
 }
 
-if keystone:
-    _BACKENDS['keystone'] = keystone.KeystoneAuth
-
 
 def get_backend(backend='noauth', options=None):
     """Loads backend `auth_backend`