From: Ian Cordasco <graffatcolmingov@gmail.com>
Date: Tue, 8 Oct 2013 02:17:59 +0000 (-0500)
Subject: Fix failing test to preserve behaviour
X-Git-Tag: v2.1.0~10^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a4605fe32426bcc404ab1eb4ea4b0dde9238a3e8;p=services%2Fpython-requests.git

Fix failing test to preserve behaviour
---

diff --git a/requests/sessions.py b/requests/sessions.py
index 8220036..0e19a86 100644
--- a/requests/sessions.py
+++ b/requests/sessions.py
@@ -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):