Skip to content

Commit

Permalink
Fix the info command with --insecure
Browse files Browse the repository at this point in the history
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
  • Loading branch information
zaitcev committed Oct 17, 2014
1 parent 83ca0b8 commit b27ca7c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions swiftclient/client.py
Expand Up @@ -1208,8 +1208,8 @@ def get_auth(self):
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)
Expand Down Expand Up @@ -1386,5 +1386,5 @@ def get_capabilities(self, url=None):
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)

0 comments on commit b27ca7c

Please sign in to comment.