Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Kenneth Reitz
2012-02-28 15:21:21 -05:00
2 changed files with 4 additions and 0 deletions
+1
View File
@@ -84,3 +84,4 @@ Patches and Suggestions
- Matt Giuca
- Adam Tauber
- Honza Javorek
- Brendan Maguire <maguire.brendan@gmail.com>
+3
View File
@@ -64,6 +64,7 @@ class Session(object):
hooks=None,
params=None,
config=None,
prefetch=False,
verify=True):
self.headers = headers or {}
@@ -74,6 +75,7 @@ class Session(object):
self.hooks = hooks or {}
self.params = params or {}
self.config = config or {}
self.prefetch = prefetch
self.verify = verify
for (k, v) in list(defaults.items()):
@@ -148,6 +150,7 @@ class Session(object):
headers = {} if headers is None else headers
params = {} if params is None else params
hooks = {} if hooks is None else hooks
prefetch = self.prefetch or prefetch
# use session's hooks as defaults
for key, cb in list(self.hooks.items()):