Skip to content

Commit a204392

Browse files
author
nilsnolde
committed
2.7 and 3.4 were failing due to syntax
1 parent 2402b5a commit a204392

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

openrouteservice/client.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,6 @@ def request(self,
216216
return self.request(url, get_params, first_request_time,
217217
retry_counter + 1, requests_kwargs,
218218
post_json)
219-
except json.JSONDecodeError:
220-
print(response.content, response.raw)
221219

222220
@property
223221
def req(self):

test/test_client.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ def test_raise_over_query_limit(self):
5555

5656
with self.assertRaises(openrouteservice.exceptions._OverQueryLimit):
5757
client = openrouteservice.Client(key=self.key, retry_over_query_limit=False)
58-
client.directions(**valid_query, validate=False)
58+
client.directions(**valid_query)
5959

6060
with self.assertRaises(openrouteservice.exceptions.Timeout):
6161
client = openrouteservice.Client(key=self.key, retry_over_query_limit=True, retry_timeout=3)
62-
client.directions(**valid_query, validate=False)
62+
client.directions(**valid_query)
6363

6464
@responses.activate
6565
def test_raise_timeout_retriable_requests(self):
@@ -78,7 +78,7 @@ def test_raise_timeout_retriable_requests(self):
7878

7979
start = time.time()
8080
with self.assertRaises(openrouteservice.exceptions.Timeout):
81-
client.directions(**valid_query, validate=False)
81+
client.directions(**valid_query)
8282
end = time.time()
8383
self.assertTrue(retry_timeout < end - start < 2 * retry_timeout)
8484

@@ -125,6 +125,6 @@ def test_key_in_header(self):
125125
status=200,
126126
content_type='application/json')
127127

128-
resp = self.client.directions(**query, validate=False)
128+
resp = self.client.directions(**query)
129129

130130
self.assertDictContainsSubset({'Authorization': self.key}, responses.calls[0].request.headers)

test/test_directions.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def test_directions(self):
4040
status=200,
4141
content_type='application/json')
4242

43-
resp = self.client.directions(**self.valid_query, validate=False)
43+
resp = self.client.directions(**self.valid_query)
4444

4545
self.assertEqual(resp, self.valid_query)
4646
self.assertIn('sample_key', responses.calls[0].request.headers.values())
@@ -54,7 +54,7 @@ def test_format_out_deprecation(self):
5454
# Cause all warnings to always be triggered.
5555
warnings.simplefilter("always")
5656
# Trigger a warning.
57-
_ = self.client.directions(**bad_query, validate=False)
57+
_ = self.client.directions(**bad_query)
5858

5959
assert len(w) == 1
6060
assert issubclass(w[-1].category, DeprecationWarning)
@@ -73,4 +73,4 @@ def test_optimized_waypoints(self):
7373

7474
# Too exhausting to really test this
7575
with self.assertRaises(openrouteservice.exceptions.ApiError):
76-
resp = self.client.directions(**query, validate=False)
76+
resp = self.client.directions(**query)

0 commit comments

Comments
 (0)