From 6140fac6aae936fb0ce067c5b278be54e27cf1f3 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 25 Oct 2011 16:10:49 -0400 Subject: [PATCH 1/5] Default Accept header, a la curl --- requests/defaults.py | 1 + 1 file changed, 1 insertion(+) diff --git a/requests/defaults.py b/requests/defaults.py index 951c056d..770001f9 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'] = {} From 6ac1e0269134694fde1236f277760f9b23f633af Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Wed, 26 Oct 2011 18:35:01 -0400 Subject: [PATCH 2/5] hooks fix #227 --- requests/sessions.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requests/sessions.py b/requests/sessions.py index ee9dafab..eaeb96e4 100644 --- a/requests/sessions.py +++ b/requests/sessions.py @@ -161,8 +161,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) From 3a4f6ba8b3429b233dada1dddb2fe859119ba494 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Wed, 26 Oct 2011 18:36:14 -0400 Subject: [PATCH 3/5] v0.7.4 --- requests/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requests/__init__.py b/requests/__init__.py index 2d9fa113..cd7d9d72 100644 --- a/requests/__init__.py +++ b/requests/__init__.py @@ -15,8 +15,8 @@ requests """ __title__ = 'requests' -__version__ = '0.7.3' -__build__ = 0x000703 +__version__ = '0.7.4' +__build__ = 0x000704 __author__ = 'Kenneth Reitz' __license__ = 'ISC' __copyright__ = 'Copyright 2011 Kenneth Reitz' From 8836c4b12acc9cc1d86f13f7870ab4337506da33 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Wed, 26 Oct 2011 18:38:32 -0400 Subject: [PATCH 4/5] history --- HISTORY.rst | 5 +++++ 1 file changed, 5 insertions(+) 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) ++++++++++++++++++ From e43b438729b31a1295b372d8668c4f2b3132f016 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Wed, 26 Oct 2011 18:42:58 -0400 Subject: [PATCH 5/5] test fix --- test_requests.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test_requests.py b/test_requests.py index 82f95954..e68493e1 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 @@ -239,7 +240,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)