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 bugs

Browse Source
This commit is contained in:
Kenneth Reitz
2011-09-25 16:02:22 -04:00
parent d2894b3c58
commit df66fa7975
2 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
requests/api.py
-22
View File
@@ -56,28 +56,6 @@ def request(method, url,
headers[k] = header_expand(v)
args = dict(
method = method,
url = url,
data = data,
params = params,
headers = headers,
cookiejar = cookies,
files = files,
auth = auth,
timeout = timeout or config.settings.timeout,
allow_redirects = allow_redirects,
proxies = proxies or config.settings.proxies,
method = method,
url = url,
data = data,
params = params,
headers = headers,
cookiejar = cookies,
files = files,
auth = auth,
timeout = timeout or config.settings.timeout,
allow_redirects = allow_redirects,
proxies = proxies or config.settings.proxies
method=method,
url=url,
data=data,
requests/models.py
+2 -2
View File
@@ -184,12 +184,12 @@ class Request(object):
# if self.cookiejar:
response.cookies = dict_from_cookiejar(self.cookiejar)
# response.cookies = dict_from_cookiejar(self.cookiejar)
# response.cookies = dict_from_cookiejar(self.cookiejar)
response.cookies = dict_from_cookiejar(self.cookiejar)
# response.cookies = dict_from_cookiejar(self.cookiejar)
except AttributeError:
pass