Repository: libcloud Updated Branches: refs/heads/trunk 02053feb0 -> c08d946d2
Fixed error when proxy_url is None. Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/e31a64d4 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/e31a64d4 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/e31a64d4 Branch: refs/heads/trunk Commit: e31a64d40d1e8144834743ae3a86f20e17b120e1 Parents: 4087f45 Author: Juan Font Alonso <juanfontalo...@gmail.com> Authored: Thu Dec 10 14:44:43 2015 +0100 Committer: Juan Font Alonso <juanfontalo...@gmail.com> Committed: Thu Dec 10 14:44:43 2015 +0100 ---------------------------------------------------------------------- libcloud/compute/drivers/vcloud.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/e31a64d4/libcloud/compute/drivers/vcloud.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/vcloud.py b/libcloud/compute/drivers/vcloud.py index efe33e4..caf462a 100644 --- a/libcloud/compute/drivers/vcloud.py +++ b/libcloud/compute/drivers/vcloud.py @@ -848,7 +848,8 @@ class VCloud_1_5_Connection(VCloudConnection): 'application/vnd.vmware.vcloud.orgList+xml')).get('href') ) - self.connection.set_http_proxy(self.proxy_url) + if self.proxy_url: + self.connection.set_http_proxy(self.proxy_url) self.connection.request(method='GET', url=org_list_url, headers=self.add_default_headers({})) body = ET.XML(self.connection.getresponse().read())