From: Ian Cordasco <graffatcolmingov@gmail.com>
Date: Sun, 24 Aug 2014 14:54:56 +0000 (-0500)
Subject: Update verify check and doc-string
X-Git-Tag: v2.4.0~5^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=596ca83f0c66460deb82af07b13ce724b9f46474;p=services%2Fpython-requests.git

Update verify check and doc-string
---

diff --git a/requests/sessions.py b/requests/sessions.py
index dafa956..508b0ef 100644
--- a/requests/sessions.py
+++ b/requests/sessions.py
@@ -593,7 +593,7 @@ class Session(SessionRedirectMixin):
         return r
 
     def merge_environment_settings(self, url, proxies, stream, verify, cert):
-        """Checks the environment and merges it with some settings."""
+        """Check the environment and merge it with some settings."""
         # Gather clues from the surrounding environment.
         if self.trust_env:
             # Set environment's proxies.
@@ -601,13 +601,11 @@ class Session(SessionRedirectMixin):
             for (k, v) in env_proxies.items():
                 proxies.setdefault(k, v)
 
-            # Look for configuration.
+            # Look for requests environment configuration and be compatible
+            # with cURL.
             if verify is True or verify is None:
-                verify = os.environ.get('REQUESTS_CA_BUNDLE')
-
-            # Curl compatibility.
-            if verify is True or verify is None:
-                verify = os.environ.get('CURL_CA_BUNDLE')
+                verify = (os.environ.get('REQUESTS_CA_BUNDLE') or
+                          os.environ.get('CURL_CA_BUNDLE'))
 
         # Merge all the kwargs.
         proxies = merge_setting(proxies, self.proxies)