From b27ca7c0c0a57d5b25f1b658237eb8930d70af8f Mon Sep 17 00:00:00 2001
From: Pete Zaitcev <zaitcev@kotori.zaitcev.us>
Date: Fri, 17 Oct 2014 13:38:01 -0600
Subject: [PATCH] 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
---
swiftclient/client.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/swiftclient/client.py b/swiftclient/client.py
index 3bc9c756..def40bf4 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)