diff options
| author | Pete Zaitcev <zaitcev@kotori.zaitcev.us> | 2014-10-17 13:38:01 -0600 |
|---|---|---|
| committer | Pete Zaitcev <zaitcev@kotori.zaitcev.us> | 2014-10-17 13:38:01 -0600 |
| commit | b27ca7c0c0a57d5b25f1b658237eb8930d70af8f (patch) | |
| tree | 2e146024248e54b30db816b89d047eb34587ef3b /swiftclient/client.py | |
| parent | 83ca0b825d067c0a39c972fb0f58ce9ac34df9d2 (diff) | |
| download | python-swiftclient-b27ca7c0c0a57d5b25f1b658237eb8930d70af8f.tar.gz | |
Fix the info command with --insecure
We forgot to propagate options into http_connection() for the info
aka capabilities command. Fix is to use the proper helper.
Fixes bug: 1381866
Change-Id: I9515203c969a1bba38dd909412355080383905f9
Diffstat (limited to 'swiftclient/client.py')
| -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) |