From: Luca De Vitis <luca@monkeython.com>
Date: Thu, 25 Aug 2011 14:26:10 +0000 (+0200)
Subject: Applied new hooks api
X-Git-Tag: v0.8.0~94^2~4^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3bf6c63d522fa096bad1bf4873bc1a9accc8ed61;p=services%2Fpython-requests.git

Applied new hooks api
---

diff --git a/requests/api.py b/requests/api.py
index 9c78c17..cc64fc4 100644
--- a/requests/api.py
+++ b/requests/api.py
@@ -43,9 +43,7 @@ def request(method, url,
 
     method = str(method).upper()
 
-    cookies = cookiejar_from_dict(cookies or dict())
-
-    hooks = setup_hooks(hooks or dict())
+    cookies = cookiejar_from_dict(cookies if cookies is not None else dict())
 
     args = dict(
         method = method,
@@ -61,23 +59,24 @@ def request(method, url,
         proxies = proxies or config.settings.proxies,
     )
     
+    hooks = setup_hooks(hooks if hooks is not None else dict())
 
     # Arguments manipulation hook.
-    args = dispatch_hooks(hooks.get('args', []), args)
+    args = dispatch_hooks(hooks['args'], args)
 
     r = Request(**args)
 
     # Pre-request hook.
-    r = dispatch_hooks(hooks.get('pre_request', []), r)
+    r = dispatch_hooks(hooks['pre_request'], r)
 
     # Send the HTTP Request.
     r.send()
 
     # Post-request hook.
-    r = dispatch_hooks(hooks.get('post_request', []), hooks, r)
+    r = dispatch_hooks(hooks['post_request'], r)
 
     # Response manipulation hook.
-    r.response = dispatch_hooks(hooks.get('response', []), r.response)
+    r.response = dispatch_hooks(hooks['response'], r.response)
 
     return r.response