aboutsummaryrefslogtreecommitdiff
path: root/requests/packages/urllib3/request.py
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2015-10-14 19:04:18 +0200
committerDaniele Tricoli <eriol@mornie.org>2015-10-14 19:04:18 +0200
commitcb40ec082506c0d9eb05978839bed2f12541af35 (patch)
tree0fe8938e38767200c05ba3e8071bfe6777f75a3e /requests/packages/urllib3/request.py
parentb4a5af4fcbf4e5d0f741aaf9978c728235b11a56 (diff)
downloadpython-requests-cb40ec082506c0d9eb05978839bed2f12541af35.tar
python-requests-cb40ec082506c0d9eb05978839bed2f12541af35.tar.gz
Import requests_2.8.1.orig.tar.gz
Diffstat (limited to 'requests/packages/urllib3/request.py')
-rw-r--r--requests/packages/urllib3/request.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/requests/packages/urllib3/request.py b/requests/packages/urllib3/request.py
index b08d6c9..a1a12bc 100644
--- a/requests/packages/urllib3/request.py
+++ b/requests/packages/urllib3/request.py
@@ -71,14 +71,22 @@ class RequestMethods(object):
headers=headers,
**urlopen_kw)
- def request_encode_url(self, method, url, fields=None, **urlopen_kw):
+ def request_encode_url(self, method, url, fields=None, headers=None,
+ **urlopen_kw):
"""
Make a request using :meth:`urlopen` with the ``fields`` encoded in
the url. This is useful for request methods like GET, HEAD, DELETE, etc.
"""
+ if headers is None:
+ headers = self.headers
+
+ extra_kw = {'headers': headers}
+ extra_kw.update(urlopen_kw)
+
if fields:
url += '?' + urlencode(fields)
- return self.urlopen(method, url, **urlopen_kw)
+
+ return self.urlopen(method, url, **extra_kw)
def request_encode_body(self, method, url, fields=None, headers=None,
encode_multipart=True, multipart_boundary=None,