From f035591d7031ba7514d517d6d1d95bbb8a55d95c Mon Sep 17 00:00:00 2001
From: Brian Eugley <Brian.Eugley@capitalone.com>
Date: Wed, 15 Apr 2015 15:23:17 -0400
Subject: [PATCH] Get proxy info from http_proxy first, HTTP_PROXY second

---
 github/Requester.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/github/Requester.py b/github/Requester.py
index 0d2527f0..ff106971 100644
--- a/github/Requester.py
+++ b/github/Requester.py
@@ -326,12 +326,10 @@ class Requester:
         ## set.
         ## http_proxy: http://user:password@proxy_host:proxy_port
         ##
-        try:
-           proxy_uri = os.getenv('http_proxy')
-        except:
-           proxy_uri = None
-
-        if (proxy_uri != None):
+        proxy_uri = os.getenv('http_proxy')
+        if proxy_uri is None:
+            proxy_uri = os.getenv('HTTP_PROXY')
+        if proxy_uri is not None:
             url = urlparse.urlparse(proxy_uri)
             conn = self.__connectionClass(url.hostname, url.port, **kwds)
             headers = {}