Merge pull request #114 from rosette-api/WS-3224-1.30-release

WS-3224: fix requests compatibility issue

Author: Katsuya-Tomioka

examples/record_similarity.py

@@ -50,7 +50,8 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
                 "dob": "1993-04-16",
                 "addr": "123 Roadlane Ave",
                 "dob2": {
-                    "date": "1993/04/16"
+                    "date": "04161993",
+                    "format": "MMddyyyy"
                 }
             },
             {
@@ -78,7 +79,8 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
                     "date": "1993-04-16"
                 },
                 "addr": {
-                  "address": "123 Roadlane Ave"
+                  "houseNumber": "123",
+                  "road": "Roadlane Ave"
                 },
                 "dob2": {
                     "date": "1993/04/16"

rosette/api.py

@@ -360,7 +360,7 @@ def __init__(self):
 
     def validate(self):
         """Internal. Do not use."""
-        for option in "fields", "properties", "records":  # required
+        for option in ["records"]:  # required
             if self[option] is None:
                 raise RosetteException(
                     "missingParameter",
@@ -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)

tests/test_rosette_api.py

@@ -993,22 +993,6 @@ def test_for_record_similarity_required_parameters(api, json_response):
 
     params = RecordSimilarityParameters()
 
-    with pytest.raises(RosetteException) as e_rosette:
-        api.record_similarity(params)
-
-    assert e_rosette.value.status == 'missingParameter'
-    assert e_rosette.value.message == 'Required Record Similarity parameter is missing: fields'
-
-    params["fields"] = {}
-
-    with pytest.raises(RosetteException) as e_rosette:
-        api.record_similarity(params)
-
-    assert e_rosette.value.status == 'missingParameter'
-    assert e_rosette.value.message == 'Required Record Similarity parameter is missing: properties'
-
-    params["properties"] = {}
-
     with pytest.raises(RosetteException) as e_rosette:
         api.record_similarity(params)