From: Ian Cordasco <ian.cordasco@rackspace.com>
Date: Wed, 2 Jul 2014 15:26:15 +0000 (-0500)
Subject: Update how we check verify when inspecting env variables
X-Git-Tag: v2.4.0~31^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=84f67379c8844ff109a200caa3f3e815fdf0beee;p=services%2Fpython-requests.git

Update how we check verify when inspecting env variables
---

diff --git a/requests/sessions.py b/requests/sessions.py
index a263138..96fff63 100644
--- a/requests/sessions.py
+++ b/requests/sessions.py
@@ -436,11 +436,11 @@ class Session(SessionRedirectMixin):
                 proxies.setdefault(k, v)
 
             # Look for configuration.
-            if not verify and verify is not False:
+            if verify is True or (verify is None and verify is not False):
                 verify = os.environ.get('REQUESTS_CA_BUNDLE')
 
             # Curl compatibility.
-            if not verify and verify is not False:
+            if verify is True or (verify is None and verify is not False):
                 verify = os.environ.get('CURL_CA_BUNDLE')
 
         # Merge all the kwargs.