kennethreitz/requests
1
0
Fork 0
mirror of https://github.com/kennethreitz/requests.git synced 2026-06-05 22:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix failing test to preserve behaviour

Browse Source
This commit is contained in:
Ian Cordasco
2013-10-07 21:17:59 -05:00
parent f12584b94a
commit a4605fe324
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
requests/sessions.py
+1 -6
View File
@@ -78,12 +78,7 @@ def merge_hooks(request_hooks, session_hooks, dict_class=OrderedDict):
if request_hooks is None or request_hooks.get('response') == []:
return session_hooks
ret = {}
for (k, v) in request_hooks.items():
if v is not None:
ret[k] = set(v).union(session_hooks.get(k, []))
return ret
return merge_setting(request_hooks, session_hooks, dict_class)
class SessionRedirectMixin(object):