openstack/python-swiftclient
Code Issues Proposed changes

Merge "Show warning when auth_version >= 2 and keystoneclient is missing"

Browse Source
This commit is contained in:
Jenkins 2014-12-15 19:07:23 +00:00 committed by Gerrit Code Review
commit d59af8cc8b
1 changed files with 1 additions and 2 deletions

3
swiftclient/client.py

@ -19,7 +19,6 @@ OpenStack Swift client library used internally
import socket import socket
import requests import requests
import sys
import logging import logging
import warnings import warnings
import functools import functools
@ -293,7 +292,7 @@ def _import_keystone_client(auth_version):
from keystoneclient import exceptions from keystoneclient import exceptions
return ksclient, exceptions return ksclient, exceptions
except ImportError: except ImportError:
sys.exit(''' raise ClientException('''
Auth versions 2.0 and 3 require python-keystoneclient, install it or use Auth Auth versions 2.0 and 3 require python-keystoneclient, install it or use Auth
version 1.0 which requires ST_AUTH, ST_USER, and ST_KEY environment version 1.0 which requires ST_AUTH, ST_USER, and ST_KEY environment
variables to be set or overridden with -A, -U, or -K.''') variables to be set or overridden with -A, -U, or -K.''')