From: Kenneth Reitz <me@kennethreitz.com>
Date: Wed, 28 Dec 2011 07:57:36 +0000 (-0500)
Subject: only use session verify when not modified
X-Git-Tag: v0.8.8~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f7e67c01ea750130e407adb6a702d02065125eb8;p=services%2Fpython-requests.git

only use session verify when not modified
---

diff --git a/requests/sessions.py b/requests/sessions.py
index 2adc390..280bd5c 100644
--- a/requests/sessions.py
+++ b/requests/sessions.py
@@ -145,7 +145,10 @@ class Session(object):
         headers = {} if headers is None else headers
         params = {} if params is None else params
         hooks = {} if hooks is None else hooks
-        verify = verify or self.verify
+
+        if verify is None:
+            verify = self.verify
+
         # use session's hooks as defaults
         for key, cb in self.hooks.iteritems():
             hooks.setdefault(key, cb)