diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-12-15 19:07:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-12-15 19:07:23 +0000 |
| commit | d59af8cc8b3f5ddf846046dd11029b84db4828ea (patch) | |
| tree | 698385c57d2ceac9d6529a2d1e5f5009f6bc1135 | |
| parent | 7980704c33c478f73c353884f099550d6fcf853d (diff) | |
| parent | 47546eb14522b70ebb765986560d914a88916276 (diff) | |
| download | python-swiftclient-d59af8cc8b3f5ddf846046dd11029b84db4828ea.tar.gz | |
Merge "Show warning when auth_version >= 2 and keystoneclient is missing"
| -rw-r--r-- | swiftclient/client.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/swiftclient/client.py b/swiftclient/client.py index 154e3e1..9a6fcd8 100644 --- a/swiftclient/client.py +++ b/swiftclient/client.py @@ -19,7 +19,6 @@ OpenStack Swift client library used internally import socket import requests -import sys import logging import warnings import functools @@ -293,7 +292,7 @@ def _import_keystone_client(auth_version): from keystoneclient import exceptions return ksclient, exceptions except ImportError: - sys.exit(''' + raise ClientException(''' 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 variables to be set or overridden with -A, -U, or -K.''') |