Skip to content

Commit 2e396aa

Browse files
r4m-juanr4m-juan
committed
Fixed bug. Removed double json dump
1 parent 5d16cad commit 2e396aa

File tree

12 files changed

+37
-56
lines changed

12 files changed

+37
-56
lines changed

‎VERSION.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# VERSION.py - MAINTAINER's. Don't edit, if you don't know what are you doing
77
# ==============================================================================
88

9-
VERSION = (0, 1, 4, 1)
9+
VERSION = (0, 1, 4, 4)
1010
RELEASE_SUFFIX = ''
1111

1212
VERSION_STRING = '.'.join([str(x) for x in VERSION])

‎route4me/activity_feed.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# -*- coding: utf-8 -*-
22

3-
import json
4-
53
from .api_endpoints import ACTIVITY_FEED
64
from .base import Base
75
from .exceptions import ParamValueException
@@ -106,9 +104,8 @@ def log_specific_message(self, **kwargs):
106104
if self.check_required_params(self.json_data, ['api_key',
107105
'activity_message',
108106
'route_id']):
109-
data = json.dumps(self.json_data, ensure_ascii=False)
110107
self.response = self.api._request_post(ACTIVITY_FEED,
111-
self.params, data=data)
108+
self.params, json=self.json_data)
112109
return self.response.json()
113110
else:
114111
raise ParamValueException('params', 'Params are not complete')

‎route4me/address.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,9 @@ def update_address(self, data, route_id, route_destination_id):
166166
'route_destination_id': route_destination_id
167167
}
168168
params.update({'api_key': self.api.key})
169-
data = json.dumps(data)
170-
response = self.api._make_request(ADDRESS_HOST,
171-
params,
172-
data,
173-
self.api._request_put)
169+
response = self.api._request_put(ADDRESS_HOST,
170+
params,
171+
json=data)
174172
return response.json()
175173

176174
def delete_address_from_route(self, route_id, route_destination_id):

‎route4me/address_book.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# -*- coding: utf-8 -*-
22

3-
import json
4-
53
from .api_endpoints import ADDRESSBOOK
64
from .base import Base
75
from .exceptions import ParamValueException
@@ -88,7 +86,7 @@ def delete_addressbook_contact(self, **kwargs):
8886
if self.check_required_params(kwargs, ['address_ids', ]):
8987
self.response = self.api._request_delete(ADDRESSBOOK,
9088
self.params,
91-
data=json.dumps(kwargs))
89+
json=kwargs)
9290
return self.response.json()
9391
else:
9492
raise ParamValueException('params', 'Params are not complete')

‎route4me/api.py‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ def _request_put(self, url, request_params, json=None, data=None):
139139
headers=self.headers,
140140
verify=self.verify_ssl)
141141

142-
def _request_delete(self, url, request_params, data=None):
142+
def _request_delete(self, url, request_params, data=None, json=None):
143143
"""
144144
DELETE request
145145
:param url:
@@ -149,6 +149,7 @@ def _request_delete(self, url, request_params, data=None):
149149
"""
150150
return requests.request('DELETE', url, params=request_params,
151151
data=data,
152+
json=json,
152153
headers=self.headers,
153154
verify=self.verify_ssl)
154155

@@ -178,10 +179,9 @@ def re_optimization(self, optimization_id, data={}):
178179
self.optimization.optimization_problem_id(optimization_id)
179180
self.optimization.reoptimize(1)
180181
data = {'parameters': data}
181-
self.response = self._make_request(API_HOST,
182-
self.optimization.get_params(),
183-
json.dumps(data),
184-
self._request_put)
182+
self.response = self._request_put(API_HOST,
183+
self.optimization.get_params(),
184+
json=data)
185185
try:
186186
return self.response.json()
187187
except ValueError:
@@ -217,10 +217,11 @@ def export_result_to_json(self, file_name):
217217
if self.response:
218218
try:
219219
f = open(file_name, 'w')
220-
f.write(json.dumps(self.response.content,
221-
ensure_ascii=False,
222-
sort_keys=True,
223-
indent=4))
220+
json.dump(self.response.content,
221+
f,
222+
ensure_ascii=False,
223+
sort_keys=True,
224+
indent=4)
224225
f.close()
225226
except Exception:
226227
raise
@@ -234,10 +235,11 @@ def export_request_to_json(self, file_name):
234235
if self.optimization.data:
235236
try:
236237
f = open(file_name, 'w')
237-
f.write(json.dumps(self.optimization.data,
238-
ensure_ascii=False,
239-
sort_keys=True,
240-
indent=4))
238+
json.dump(self.optimization.data,
239+
f,
240+
ensure_ascii=False,
241+
sort_keys=True,
242+
indent=4)
241243
f.close()
242244
except Exception:
243245
raise

‎route4me/avoidance_zones.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# -*- coding: utf-8 -*-
22
# codebeat:disable[SIMILARITY, ABC]
33

4-
import json
54

65
from .api_endpoints import AVOIDANCE
76
from .base import Base
@@ -60,7 +59,7 @@ def add_avoidance_zone(self, **kwargs):
6059
'territory']):
6160
self.response = self.api._request_post(AVOIDANCE,
6261
self.params,
63-
data=json.dumps(kwargs))
62+
json=kwargs)
6463
return self.response.json()
6564
else:
6665
raise ParamValueException('params', 'Params are not complete')
@@ -91,7 +90,7 @@ def update_avoidance_zone(self, territory_id, **kwargs):
9190
'territory']):
9291
self.response = self.api._request_put(AVOIDANCE,
9392
self.params,
94-
data=json.dumps(kwargs))
93+
json=kwargs)
9594
return self.response.json()
9695
else:
9796
raise ParamValueException('params', 'Params are not complete')

‎route4me/members.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,9 @@ def app_purchase_user_license(self, **kwargs):
4343
'token',
4444
'payload',
4545
'format', ]):
46-
data = json.dumps(kwargs, ensure_ascii=False)
4746
response = self.api._request_post(USER_LICENSE_HOST,
4847
self.params,
49-
data=data)
48+
json=kwargs)
5049
try:
5150
return json.loads(response.content)
5251
except ValueError:
@@ -63,10 +62,9 @@ def verify_device_license(self, **kwargs):
6362
if self.check_required_params(kwargs, ['device_id',
6463
'device_type',
6564
'format', ]):
66-
data = json.dumps(kwargs, ensure_ascii=False)
6765
response = self.api._request_post(VERIFY_DEVICE_LICENSE,
6866
self.params,
69-
data=data)
67+
json=kwargs)
7068
try:
7169
return json.loads(response.content)
7270
except ValueError:

‎route4me/optimization.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# -*- coding: utf-8 -*-
22

3-
import json
4-
53
from .api_endpoints import ADDRESS_HOST, API_HOST
64
from .base import Base
75
from .exceptions import ParamValueException
@@ -83,10 +81,9 @@ def delete_optimization(self, **kwargs):
8381
"""
8482
self.json_data = kwargs
8583
if self.check_required_params(kwargs, ['optimization_problem_ids', ]):
86-
data = json.dumps(self.json_data, ensure_ascii=False)
8784
self.response = self.api._request_delete(API_HOST,
8885
self.params,
89-
data=data)
86+
json=kwargs)
9087
response = self.response.json()
9188
return response
9289
else:

‎route4me/orders.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@ def create_order(self, **kwargs):
2929
:return: API response content
3030
"""
3131
if self.check_required_params(kwargs, self.REQUIRED_FIELDS):
32-
data = json.dumps(kwargs, ensure_ascii=False)
3332
response = self.api._request_post(ORDERS_HOST,
3433
self.params,
35-
data=data)
34+
json=kwargs)
3635
try:
3736
return response.json()
3837
except ValueError:
@@ -66,7 +65,7 @@ def update_order(self, **kwargs):
6665
if self.check_required_params(kwargs, self.REQUIRED_FIELDS):
6766
response = self.api._request_put(ORDERS_HOST,
6867
self.params,
69-
data=json.dumps(kwargs))
68+
json=kwargs)
7069
try:
7170
return json.loads(response.content)
7271
except ValueError:
@@ -83,7 +82,7 @@ def delete_order(self, **kwargs):
8382
if self.check_required_params(kwargs, ['order_ids', ]):
8483
response = self.api._request_delete(ORDERS_HOST,
8584
self.params,
86-
data=json.dumps(kwargs))
85+
jsom=kwargs)
8786
try:
8887
return json.loads(response.content)
8988
except ValueError:

‎route4me/route.py‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
# codebeat:disable[TOO_MANY_FUNCTIONS]
44

5-
import json
65

76
from .api_endpoints import ROUTE_HOST, EXPORTER
87
from .api_endpoints import ADDRESS_HOST, GET_ACTIVITIES_HOST, DUPLICATE_ROUTE, SHARE_ROUTE_HOST
@@ -177,10 +176,9 @@ def insert_address_into_route_optimal_position(self, **kwargs):
177176
'optimal_position']):
178177
params = {'api_key': self.params['api_key'],
179178
'route_id': kwargs.pop('route_id')}
180-
data = json.dumps(kwargs, ensure_ascii=False)
181179
response = self.api._request_put(ROUTE_HOST,
182180
params,
183-
data=data)
181+
json=kwargs)
184182
return response.json()
185183
else:
186184
raise ParamValueException('params', 'Params are not complete')
@@ -254,9 +252,8 @@ def resequence_route(self, **kwargs):
254252
'route_id': kwargs.pop('route_id'),
255253
'route_destination_id': kwargs.pop('route_destination_id'),
256254
}
257-
data = json.dumps(kwargs, ensure_ascii=False)
258255
response = self.api._request_put(ROUTE_HOST,
259-
params, data=data)
256+
params, json=kwargs)
260257
return response.json()
261258

262259
else:
@@ -289,10 +286,9 @@ def merge_routes(self, **kwargs):
289286
AttributeError if there is an error deleting a route
290287
"""
291288
if self.check_required_params(kwargs, ['route_ids']):
292-
data = json.dumps(kwargs, ensure_ascii=False)
293289
response = self.api._request_post(MERGE_ROUTES_HOST,
294290
self.params,
295-
data=data)
291+
json=kwargs)
296292
return response.json()
297293

298294
else:
@@ -330,9 +326,8 @@ def update_route_destination_custom_data(self, **kwargs):
330326
'route_id': kwargs.pop('route_id'),
331327
'route_destination_id': kwargs.pop('route_destination_id'),
332328
}
333-
data = json.dumps(kwargs, ensure_ascii=False)
334329
response = self.api._request_put(ADDRESS_HOST,
335-
params, data=data)
330+
params, json=kwargs)
336331
return response.json()
337332

338333
else:

0 commit comments

Comments
 (0)