diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-05-02 18:36:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-05-02 18:36:24 +0000 |
| commit | fcb3100b7d6870b1ae594a7e3e34fad5db0d1180 (patch) | |
| tree | 170e8425c9039f234fde340007fb80ba3553f696 | |
| parent | 1eb2c29856fda85abbf7c06802b4fb09cc66bb41 (diff) | |
| parent | 9aa52eecb5193e145ec9b396f105b085fb87a456 (diff) | |
| download | python-swiftclient-fcb3100b7d6870b1ae594a7e3e34fad5db0d1180.tar.gz | |
Merge "Confirm we have auth creds before clearing preauth"
| -rw-r--r-- | swiftclient/client.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/swiftclient/client.py b/swiftclient/client.py index e7409ab..f934876 100644 --- a/swiftclient/client.py +++ b/swiftclient/client.py @@ -1032,7 +1032,9 @@ class Connection(object): raise if err.http_status == 401: self.url = self.token = None - if self.attempts > 1: + if self.attempts > 1 or not all((self.authurl, + self.user, + self.key)): raise elif err.http_status == 408: self.http_conn = None |