diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-19 03:00:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-19 03:00:38 +0000 |
| commit | bbe3378ebbdfd5b5aeae979965fa2ac9e165afb4 (patch) | |
| tree | fc68cb9a882abf46cfb6009f2a4e6087d229a96f | |
| parent | c88cddd2d89a230146787a8cbf3db0b60988d747 (diff) | |
| parent | b27ca7c0c0a57d5b25f1b658237eb8930d70af8f (diff) | |
| download | python-swiftclient-bbe3378ebbdfd5b5aeae979965fa2ac9e165afb4.tar.gz | |
Merge "Fix the info command with --insecure"
| -rw-r--r-- | swiftclient/client.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/swiftclient/client.py b/swiftclient/client.py index 3bc9c75..def40bf 100644 --- a/swiftclient/client.py +++ b/swiftclient/client.py @@ -1208,8 +1208,8 @@ class Connection(object): cacert=self.cacert, insecure=self.insecure) - def http_connection(self): - return http_connection(self.url, + def http_connection(self, url=None): + return http_connection(url if url else self.url, cacert=self.cacert, insecure=self.insecure, ssl_compression=self.ssl_compression) @@ -1386,5 +1386,5 @@ class Connection(object): scheme = urlparse(url).scheme netloc = urlparse(url).netloc url = scheme + '://' + netloc + '/info' - http_conn = http_connection(url, ssl_compression=self.ssl_compression) + http_conn = self.http_connection(url) return get_capabilities(http_conn) |