kennethreitz/requests
1
0
Fork 0
mirror of https://github.com/kennethreitz/requests.git synced 2026-06-05 22:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge fixes

Browse Source
This commit is contained in:
Kenneth Reitz
2011-10-13 22:02:46 -04:00
parent 46f0146adf
commit aa31b6b4dd
2 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
requests/api.py
+1 -10
View File
@@ -112,13 +112,9 @@ def get(url, **kwargs):
:param **kwargs: Optional arguments that ``request`` takes.
"""
return request('GET', url, **kwargs)
kwargs.setdefault('allow_redirects', True)
return request('GET', url, **kwargs)
if "allow_redirects" not in kwargs:
kwargs["allow_redirects"] = True
return request('get', url, **kwargs)
def head(url, **kwargs):
@@ -141,13 +137,8 @@ def head(url, **kwargs):
:param **kwargs: Optional arguments that ``request`` takes.
"""
return request('HEAD', url, **kwargs)
kwargs.setdefault('allow_redirects', True)
return request('HEAD', url, **kwargs)
if "allow_redirects" not in kwargs:
kwargs["allow_redirects"] = True
return request('head', url, **kwargs)
def post(url, data='', **kwargs):
requests/models.py
-5
View File
@@ -214,12 +214,7 @@ class Request(object):
while (
('location' in r.headers) and
((self.method in ('GET', 'HEAD')) or
(r.status_code is codes.see_other) or
(self.allow_redirects))
((r.status_code is codes.see_other) or (self.allow_redirects))
((r.status_code is codes.see_other) or
(self.allow_redirects))
):
r.fo.close()