Move hooks out of top-level loop
authorKenneth Reitz <me@kennethreitz.com>
Sun, 23 Oct 2011 16:26:41 +0000 (12:26 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 23 Oct 2011 16:26:41 +0000 (12:26 -0400)
requests/async.py
requests/sessions.py

index db25f6a597916a0fbf156d43eb0222f0b627321b..e14ac946707a9c8647614c60df82b1fc0c7f56f8 100644 (file)
@@ -45,12 +45,6 @@ def _send(r, pools=None):
 
     r.send()
 
-    # Post-request hook.
-    r = dispatch_hook('post_request', r.hooks, r)
-
-    # Response manipulation hook.
-    r.response = dispatch_hook('response', r.hooks, r.response)
-
     return r.response
 
 
index a88a062697ea9e22c952b74abc622c8814b21d74..f1124ae2c18b28c3fa1a953274fae1ae27a801b4 100644 (file)
@@ -157,14 +157,8 @@ class Session(object):
 
             args[attr] = merge_kwargs(local_val, session_val)
 
-        # Arguments manipulation hook.
-        args = dispatch_hook('args', hooks, args)
-
         r = Request(**args)
 
-        # Pre-request hook.
-        r = dispatch_hook('pre_request', hooks, r)
-
         # Don't send if asked nicely.
         if not return_response:
             return r
@@ -172,12 +166,6 @@ class Session(object):
         # Send the HTTP Request.
         r.send()
 
-        # Post-request hook.
-        r = dispatch_hook('post_request', hooks, r)
-
-        # Response manipulation hook.
-        r.response = dispatch_hook('response', hooks, r.response)
-
         return r.response