Merge branch 'master' into simplify_is_none

SalesforcePy/commons.py

@@ -254,17 +254,6 @@ def request(self):
         finally:
             return response
 
-    def set_proxies(self, proxies):
-        """ Sets `proxies` for this class.
-
-        :param proxies: A dict containing proxies to use (see: # noqa
-        `Proxies <http://docs.python-requests.org/en/master/user/advanced/#proxies)>`_ # noqa
-        in the python-requests.org guide.
-
-        :type: dict
-        """
-        self.proxies = proxies
-
 
 class OAuthRequest(BaseRequest):
     """ Base class for all OAuth request objects

SalesforcePy/sfdc.py

@@ -164,10 +164,7 @@ def set_api_version(self, **kwargs):
             headers = {'Content-Type': 'application/json'}
             r = requests.get(service, headers=headers, proxies=self.proxies)
             if r.status_code == 200:
-                versions = []
-                for i in r.json():
-                    versions.append(i['version'])
-                self.client_kwargs.update({'version': max(versions)})
+                self.client_kwargs.update({'version': max(i['version'] for i in r.json())})
             else:
                 # return a known recent api version
                 self.client_kwargs.update({'version': DEFAULT_API_VERSION})
@@ -536,8 +533,8 @@ def request(self, *args):
         len_results = len(results)
 
         if len_results == 0:
-            q = Query(self.session_id, self.instance_url, self.query_string)
-            q.set_proxies(self.proxies)
+            q = Query(self.session_id, self.instance_url, self.query_string,
+                      proxies=self.proxies, version=self.api_version)
             response = q.request()
             results.append(response)
             last = response

requirements-dev.txt

@@ -4,4 +4,4 @@ pytest==5.4.3
 python-coveralls==2.9.1
 pytest-flake8==1.0.6
 flake8==3.8.2
-wheel==0.33.4
+wheel==0.38.1

setup.py

@@ -13,7 +13,7 @@
     'python-coveralls==2.9.1',
     'pytest-flake8==1.0.6',
     'flake8==3.8.2',
-    'wheel==0.33.4',
+    'wheel==0.38.1',
 ]
 
 

tests/test_query_more.py

@@ -1,6 +1,8 @@
-import testutil
 import responses
 
+import SalesforcePy as sfdc
+import testutil
+
 
 @responses.activate
 def test_query_more_singlebatch():
@@ -13,6 +15,24 @@ def test_query_more_singlebatch():
     assert query_result[0][0].get("done")
 
 
+@responses.activate
+def test_query_more_singlebatch_kwargs():
+    testutil.add_response("login_response_200")
+    testutil.add_response("query_response_200_version_40")
+    client = sfdc.client(
+        username=testutil.username,
+        password=testutil.password,
+        client_id=testutil.client_id,
+        client_secret=testutil.client_secret,
+        login_url=testutil.login_url,
+        version="40.0",
+    )
+    client.login()
+    query_result = client.query_more("SELECT Id, Name FROM Account LIMIT 10")
+    assert query_result[0][0] == testutil.mock_responses["query_response_200_version_40"]["body"]
+    assert query_result[0][0].get("done")
+
+
 @responses.activate
 def test_query_more_multibatch():
     testutil.add_response("login_response_200")