WS-3224: fix requests compatibility issue

Author: Adam Soos

rosette/api.py

@@ -528,7 +528,7 @@ def call(self, parameters, paramtype=None):
             request = requests.Request(
                 'POST', url, files=files, headers=headers, params=payload)
             prepared_request = self.api.session.prepare_request(request)
-            settings = self.api.session.merge_environment_settings(prepared_request.url, {}, {}, None, {})
+            settings = self.api.session.merge_environment_settings(prepared_request.url, {}, {}, None, None)
             response = self.api.session.send(prepared_request, **settings)
             rdata = response.content
             response_headers = {"responseHeaders": dict(response.headers)}
@@ -671,7 +671,7 @@ def _make_request(self, operation, url, data, headers):
             operation, url, data=data, headers=headers, params=payload)
         prepared_request = self.session.prepare_request(request)
         # Take into account environment settings, e.g. HTTP_PROXY and HTTPS_PROXY
-        settings = self.session.merge_environment_settings(prepared_request.url, {}, {}, None, {})
+        settings = self.session.merge_environment_settings(prepared_request.url, {}, {}, None, None)
 
         try:
             response = self.session.send(prepared_request, **settings)