diff --git a/HISTORY.rst b/HISTORY.rst index 1edef631..b32181e8 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,6 +1,11 @@ History ------- +0.7.4 (2011-10-26) +++++++++++++++++++ + +* Sesion Hooks fix. + 0.7.3 (2011-10-23) ++++++++++++++++++ diff --git a/requests/defaults.py b/requests/defaults.py index e3f5478d..90faabee 100644 --- a/requests/defaults.py +++ b/requests/defaults.py @@ -26,6 +26,7 @@ defaults = dict() defaults['base_headers'] = { 'User-Agent': 'python-requests/%s' % __version__, 'Accept-Encoding': ', '.join(('identity', 'deflate', 'compress', 'gzip')), + 'Accept': '*/*' } defaults['proxies'] = {} @@ -36,4 +37,4 @@ defaults['decode_unicode'] = True defaults['timeout_fallback'] = True # defaults['keep_alive'] = True defaults['pool_connections'] = 10 -defaults['pool_maxsize'] = 1 \ No newline at end of file +defaults['pool_maxsize'] = 1 diff --git a/requests/sessions.py b/requests/sessions.py index d35dbd21..9a10808e 100644 --- a/requests/sessions.py +++ b/requests/sessions.py @@ -168,8 +168,9 @@ class Session(object): args[attr] = merge_kwargs(local_val, session_val) + # Arguments manipulation hook. - args = dispatch_hook('args', hooks, args) + args = dispatch_hook('args', args['hooks'], args) r = Request(**args) diff --git a/test_requests.py b/test_requests.py index fa9390f5..261a01c0 100755 --- a/test_requests.py +++ b/test_requests.py @@ -10,6 +10,7 @@ import unittest import requests import envoy +from urllib2 import HTTPError try: import omnijson as json @@ -240,7 +241,7 @@ class RequestsTestSuite(unittest.TestCase): def test_status_raising(self): r = requests.get(httpbin('status', '404')) - self.assertRaises(requests.HTTPError, r.raise_for_status) + self.assertRaises(HTTPError, r.raise_for_status) r = requests.get(httpbin('status', '200')) self.assertFalse(r.error)