Imported Upstream version 1.1.0

1 files changed, 10 insertions, 18 deletions

diff --git a/requests/hooks.py b/requests/hooks.py
index 13d0eb5..6135033 100644
--- a/requests/hooks.py
+++ b/requests/hooks.py
@@ -8,28 +8,21 @@ This module provides the capabilities for the Requests hooks system.
 
 Available hooks:
 
-``args``:
-    A dictionary of the arguments being sent to Request().
-
-``pre_request``:
-    The Request object, directly after being created.
-
-``pre_send``:
-    The Request object, directly before being sent.
-
-``post_request``:
-    The Request object, directly after being sent.
-
 ``response``:
     The response generated from a Request.
 
 """
 
-import traceback
 
+HOOKS = ['response']
 
-HOOKS = ('args', 'pre_request', 'pre_send', 'post_request', 'response')
+def default_hooks():
+    hooks = {}
+    for event in HOOKS:
+        hooks[event] = []
+    return hooks
 
+# TODO: response is the only one
 
 def dispatch_hook(key, hooks, hook_data):
     """Dispatches a hook dictionary on a given piece of data."""
@@ -43,9 +36,8 @@ def dispatch_hook(key, hooks, hook_data):
             hooks = [hooks]
 
         for hook in hooks:
-            try:
-                hook_data = hook(hook_data) or hook_data
-            except Exception:
-                traceback.print_exc()
+            _hook_data = hook(hook_data)
+            if _hook_data is not None:
+                hook_data = _hook_data
 
     return hook_data