Return-Path: X-Original-To: apmail-libcloud-notifications-archive@www.apache.org Delivered-To: apmail-libcloud-notifications-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 48FD318D15 for ; Fri, 15 Jan 2016 15:49:00 +0000 (UTC) Received: (qmail 41205 invoked by uid 500); 15 Jan 2016 15:49:00 -0000 Delivered-To: apmail-libcloud-notifications-archive@libcloud.apache.org Received: (qmail 41150 invoked by uid 500); 15 Jan 2016 15:49:00 -0000 Mailing-List: contact notifications-help@libcloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@libcloud.apache.org Delivered-To: mailing list notifications@libcloud.apache.org Received: (qmail 41128 invoked by uid 500); 15 Jan 2016 15:49:00 -0000 Delivered-To: apmail-libcloud-commits@libcloud.apache.org Received: (qmail 41125 invoked by uid 99); 15 Jan 2016 15:49:00 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jan 2016 15:49:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 092D4DFB92; Fri, 15 Jan 2016 15:48:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: erjohnso@apache.org To: commits@libcloud.apache.org Date: Fri, 15 Jan 2016 15:49:00 -0000 Message-Id: In-Reply-To: <8cae4746a8b044e88d8004c89c543629@git.apache.org> References: <8cae4746a8b044e88d8004c89c543629@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/6] libcloud git commit: Fixed error when proxy_url is None. 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/1b3b91cd Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/1b3b91cd Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/1b3b91cd Branch: refs/heads/0.20.1 Commit: 1b3b91cd0e96161b059c15ad2da183f500c3878e Parents: 38b61eb Author: Juan Font Alonso Authored: Thu Dec 10 14:44:43 2015 +0100 Committer: Eric Johnson Committed: Fri Jan 15 15:22:15 2016 +0000 ---------------------------------------------------------------------- libcloud/compute/drivers/vcloud.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/1b3b91cd/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())