Fix failing test to preserve behaviour
authorIan Cordasco <graffatcolmingov@gmail.com>
Tue, 8 Oct 2013 02:17:59 +0000 (21:17 -0500)
committerIan Cordasco <graffatcolmingov@gmail.com>
Tue, 8 Oct 2013 02:17:59 +0000 (21:17 -0500)
requests/sessions.py

index 8220036326bd3c66c09ab3579c42b99dd566d5af..0e19a866cbd6247d63a2cf5c0e63034c0551fb42 100644 (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):