openstack/python-swiftclient
Code Issues Proposed changes

Merge "Fix the info command with --insecure"

Browse Source
This commit is contained in:
Jenkins 2014-10-19 03:00:38 +00:00 committed by Gerrit Code Review
commit bbe3378ebb
1 changed files with 3 additions and 3 deletions

6
swiftclient/client.py

@ -1208,8 +1208,8 @@ class Connection(object):
cacert=self.cacert, cacert=self.cacert,
insecure=self.insecure) insecure=self.insecure)
def http_connection(self): def http_connection(self, url=None):
return http_connection(self.url, return http_connection(url if url else self.url,
cacert=self.cacert, cacert=self.cacert,
insecure=self.insecure, insecure=self.insecure,
ssl_compression=self.ssl_compression) ssl_compression=self.ssl_compression)
@ -1386,5 +1386,5 @@ class Connection(object):
scheme = urlparse(url).scheme scheme = urlparse(url).scheme
netloc = urlparse(url).netloc netloc = urlparse(url).netloc
url = scheme + '://' + netloc + '/info' 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) return get_capabilities(http_conn)