Repository: libcloud Updated Branches: refs/heads/trunk 3e85cf159 -> 66f161739
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/f755d559 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/f755d559 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/f755d559 Branch: refs/heads/trunk Commit: f755d5597793bc8f3109f09e6b39c4ace2d740bf Parents: 3e85cf1 Author: Juan Font Alonso <[email protected]> Authored: Thu Dec 10 14:44:43 2015 +0100 Committer: anthony-shaw <[email protected]> Committed: Wed Dec 16 15:30:43 2015 +1100 ---------------------------------------------------------------------- libcloud/compute/drivers/vcloud.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/f755d559/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())
