Merge pull request boto#1528 from joguSD/remove-request-url

Remove request_url kwarg as it's not support in all urllib3 versions

botocore/httpsession.py

@@ -234,7 +234,6 @@ def send(self, request):
             urllib_response = conn.urlopen(
                 method=request.method,
                 url=request_target,
-                request_url=request.url,
                 body=request.body,
                 headers=request.headers,
                 retries=False,

botocore/response.py

@@ -77,8 +77,8 @@ def read(self, amt=None):
         try:
             chunk = self._raw_stream.read(amt)
         except URLLib3ReadTimeoutError as e:
-            url = self._raw_stream.geturl()
-            raise ReadTimeoutError(endpoint_url=url, error=e)
+            # TODO: the url will be None as urllib3 isn't setting it yet
+            raise ReadTimeoutError(endpoint_url=e.url, error=e)
         self._amount_read += len(chunk)
         if amt is None or (not chunk and amt > 0):
             # If the server sends empty contents or

tests/unit/test_http_session.py

@@ -103,7 +103,6 @@ def assert_request_sent(self, headers=None, body=None, url='/'):
             assert_same_host=False,
             preload_content=False,
             decode_content=False,
-            request_url=ANY,
         )
 
     def test_forwards_max_pool_size(self):