Skip to content

Commit 2d545c7

Browse files
geekerzpgeekerzp
committed
updated ApiClient of python sdk.
Change staticmethod to instance method.
1 parent 3beeb61 commit 2d545c7

File tree

7 files changed

+72
-88
lines changed

7 files changed

+72
-88
lines changed

‎modules/swagger-codegen/src/main/resources/python/api.mustache‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ from six import iteritems
2929

3030
from ..util import remove_none
3131

32-
from ..swagger import ApiClient
33-
3432
from .. import config
3533

3634
{{#operations}}
@@ -76,12 +74,12 @@ class {{classname}}(object):
7674
body_params = {{#bodyParam}}params.get('{{paramName}}'){{/bodyParam}}{{^bodyParam}}None{{/bodyParam}}
7775

7876
# HTTP header `Accept`
79-
header_params['Accept'] = ApiClient.select_header_accept([{{#produces}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/produces}}])
77+
header_params['Accept'] = self.api_client.select_header_accept([{{#produces}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/produces}}])
8078
if not header_params['Accept']:
8179
del header_params['Accept']
8280

8381
# HTTP header `Content-Type`
84-
header_params['Content-Type'] = ApiClient.select_header_content_type([{{#consumes}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/consumes}}])
82+
header_params['Content-Type'] = self.api_client.select_header_content_type([{{#consumes}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/consumes}}])
8583

8684
response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params,
8785
body=body_params, post_params=form_params, files=files,

‎modules/swagger-codegen/src/main/resources/python/swagger.mustache‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -66,28 +66,28 @@ class ApiClient(object):
6666
if self.cookie:
6767
headers['Cookie'] = self.cookie
6868
if headers:
69-
headers = ApiClient.sanitize_for_serialization(headers)
69+
headers = self.sanitize_for_serialization(headers)
7070

7171
# path parameters
7272
if path_params:
73-
path_params = ApiClient.sanitize_for_serialization(path_params)
73+
path_params = self.sanitize_for_serialization(path_params)
7474
for k, v in iteritems(path_params):
7575
replacement = quote(str(self.to_path_value(v)))
7676
resource_path = resource_path.replace('{' + k + '}', replacement)
7777

7878
# query parameters
7979
if query_params:
80-
query_params = ApiClient.sanitize_for_serialization(query_params)
80+
query_params = self.sanitize_for_serialization(query_params)
8181
query_params = {k: self.to_path_value(v) for k, v in iteritems(query_params)}
8282

8383
# post parameters
8484
if post_params:
8585
post_params = self.prepare_post_parameters(post_params, files)
86-
post_params = ApiClient.sanitize_for_serialization(post_params)
86+
post_params = self.sanitize_for_serialization(post_params)
8787

8888
# body
8989
if body:
90-
body = ApiClient.sanitize_for_serialization(body)
90+
body = self.sanitize_for_serialization(body)
9191

9292
# request url
9393
url = self.host + resource_path
@@ -115,8 +115,7 @@ class ApiClient(object):
115115
else:
116116
return str(obj)
117117

118-
@staticmethod
119-
def sanitize_for_serialization(obj):
118+
def sanitize_for_serialization(self, obj):
120119
"""
121120
Sanitize an object for Request.
122121
@@ -132,7 +131,7 @@ class ApiClient(object):
132131
elif isinstance(obj, (str, int, float, bool, tuple)):
133132
return obj
134133
elif isinstance(obj, list):
135-
return [ApiClient.sanitize_for_serialization(sub_obj) for sub_obj in obj]
134+
return [self.sanitize_for_serialization(sub_obj) for sub_obj in obj]
136135
elif isinstance(obj, (datetime.datetime, datetime.date)):
137136
return obj.isoformat()
138137
else:
@@ -145,7 +144,7 @@ class ApiClient(object):
145144
obj_dict = {obj.attribute_map[key]: val
146145
for key, val in iteritems(obj.__dict__)
147146
if key != 'swagger_types' and key != 'attribute_map' and val is not None}
148-
return {key: ApiClient.sanitize_for_serialization(val)
147+
return {key: self.sanitize_for_serialization(val)
149148
for key, val in iteritems(obj_dict)}
150149

151150
def deserialize(self, obj, obj_class):
@@ -253,8 +252,7 @@ class ApiClient(object):
253252

254253
return params
255254

256-
@staticmethod
257-
def select_header_accept(accepts):
255+
def select_header_accept(self, accepts):
258256
"""
259257
Return `Accept` based on an array of accepts provided
260258
"""
@@ -268,8 +266,7 @@ class ApiClient(object):
268266
else:
269267
return ', '.join(accepts)
270268

271-
@staticmethod
272-
def select_header_content_type(content_types):
269+
def select_header_content_type(self, content_types):
273270
"""
274271
Return `Content-Type` baseed on an array of content_types provided
275272
"""

‎samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/pet_api.py‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929

3030
from ..util import remove_none
3131

32-
from ..swagger import ApiClient
33-
3432
from .. import config
3533

3634
class PetApi(object):
@@ -71,12 +69,12 @@ def update_pet(self, **kwargs):
7169
body_params = params.get('body')
7270

7371
# HTTP header `Accept`
74-
header_params['Accept'] = ApiClient.select_header_accept(['application/json', 'application/xml'])
72+
header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml'])
7573
if not header_params['Accept']:
7674
del header_params['Accept']
7775

7876
# HTTP header `Content-Type`
79-
header_params['Content-Type'] = ApiClient.select_header_content_type(['application/json', 'application/xml'])
77+
header_params['Content-Type'] = self.api_client.select_header_content_type(['application/json', 'application/xml'])
8078

8179
response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params,
8280
body=body_params, post_params=form_params, files=files,
@@ -112,12 +110,12 @@ def add_pet(self, **kwargs):
112110
body_params = params.get('body')
113111

114112
# HTTP header `Accept`
115-
header_params['Accept'] = ApiClient.select_header_accept(['application/json', 'application/xml'])
113+
header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml'])
116114
if not header_params['Accept']:
117115
del header_params['Accept']
118116

119117
# HTTP header `Content-Type`
120-
header_params['Content-Type'] = ApiClient.select_header_content_type(['application/json', 'application/xml'])
118+
header_params['Content-Type'] = self.api_client.select_header_content_type(['application/json', 'application/xml'])
121119

122120
response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params,
123121
body=body_params, post_params=form_params, files=files,
@@ -153,12 +151,12 @@ def find_pets_by_status(self, **kwargs):
153151
body_params = None
154152

155153
# HTTP header `Accept`
156-
header_params['Accept'] = ApiClient.select_header_accept(['application/json', 'application/xml'])
154+
header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml'])
157155
if not header_params['Accept']:
158156
del header_params['Accept']
159157

160158
# HTTP header `Content-Type`
161-
header_params['Content-Type'] = ApiClient.select_header_content_type([])
159+
header_params['Content-Type'] = self.api_client.select_header_content_type([])
162160

163161
response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params,
164162
body=body_params, post_params=form_params, files=files,
@@ -196,12 +194,12 @@ def find_pets_by_tags(self, **kwargs):
196194
body_params = None
197195

198196
# HTTP header `Accept`
199-
header_params['Accept'] = ApiClient.select_header_accept(['application/json', 'application/xml'])
197+
header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml'])
200198
if not header_params['Accept']:
201199
del header_params['Accept']
202200

203201
# HTTP header `Content-Type`
204-
header_params['Content-Type'] = ApiClient.select_header_content_type([])
202+
header_params['Content-Type'] = self.api_client.select_header_content_type([])
205203

206204
response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params,
207205
body=body_params, post_params=form_params, files=files,
@@ -243,12 +241,12 @@ def get_pet_by_id(self, pet_id, **kwargs):
243241
body_params = None
244242

245243
# HTTP header `Accept`
246-
header_params['Accept'] = ApiClient.select_header_accept(['application/json', 'application/xml'])
244+
header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml'])
247245
if not header_params['Accept']:
248246
del header_params['Accept']
249247

250248
# HTTP header `Content-Type`
251-
header_params['Content-Type'] = ApiClient.select_header_content_type([])
249+
header_params['Content-Type'] = self.api_client.select_header_content_type([])
252250

253251
response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params,
254252
body=body_params, post_params=form_params, files=files,
@@ -292,12 +290,12 @@ def update_pet_with_form(self, pet_id, **kwargs):
292290
body_params = None
293291

294292
# HTTP header `Accept`
295-
header_params['Accept'] = ApiClient.select_header_accept(['application/json', 'application/xml'])
293+
header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml'])
296294
if not header_params['Accept']:
297295
del header_params['Accept']
298296

299297
# HTTP header `Content-Type`
300-
header_params['Content-Type'] = ApiClient.select_header_content_type(['application/x-www-form-urlencoded'])
298+
header_params['Content-Type'] = self.api_client.select_header_content_type(['application/x-www-form-urlencoded'])
301299

302300
response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params,
303301
body=body_params, post_params=form_params, files=files,
@@ -338,12 +336,12 @@ def delete_pet(self, pet_id, **kwargs):
338336
body_params = None
339337

340338
# HTTP header `Accept`
341-
header_params['Accept'] = ApiClient.select_header_accept(['application/json', 'application/xml'])
339+
header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml'])
342340
if not header_params['Accept']:
343341
del header_params['Accept']
344342

345343
# HTTP header `Content-Type`
346-
header_params['Content-Type'] = ApiClient.select_header_content_type([])
344+
header_params['Content-Type'] = self.api_client.select_header_content_type([])
347345

348346
response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params,
349347
body=body_params, post_params=form_params, files=files,
@@ -385,12 +383,12 @@ def upload_file(self, pet_id, **kwargs):
385383
body_params = None
386384

387385
# HTTP header `Accept`
388-
header_params['Accept'] = ApiClient.select_header_accept(['application/json', 'application/xml'])
386+
header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml'])
389387
if not header_params['Accept']:
390388
del header_params['Accept']
391389

392390
# HTTP header `Content-Type`
393-
header_params['Content-Type'] = ApiClient.select_header_content_type(['multipart/form-data'])
391+
header_params['Content-Type'] = self.api_client.select_header_content_type(['multipart/form-data'])
394392

395393
response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params,
396394
body=body_params, post_params=form_params, files=files,

‎samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/store_api.py‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929

3030
from ..util import remove_none
3131

32-
from ..swagger import ApiClient
33-
3432
from .. import config
3533

3634
class StoreApi(object):
@@ -70,12 +68,12 @@ def get_inventory(self, **kwargs):
7068
body_params = None
7169

7270
# HTTP header `Accept`
73-
header_params['Accept'] = ApiClient.select_header_accept(['application/json', 'application/xml'])
71+
header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml'])
7472
if not header_params['Accept']:
7573
del header_params['Accept']
7674

7775
# HTTP header `Content-Type`
78-
header_params['Content-Type'] = ApiClient.select_header_content_type([])
76+
header_params['Content-Type'] = self.api_client.select_header_content_type([])
7977

8078
response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params,
8179
body=body_params, post_params=form_params, files=files,
@@ -113,12 +111,12 @@ def place_order(self, **kwargs):
113111
body_params = params.get('body')
114112

115113
# HTTP header `Accept`
116-
header_params['Accept'] = ApiClient.select_header_accept(['application/json', 'application/xml'])
114+
header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml'])
117115
if not header_params['Accept']:
118116
del header_params['Accept']
119117

120118
# HTTP header `Content-Type`
121-
header_params['Content-Type'] = ApiClient.select_header_content_type([])
119+
header_params['Content-Type'] = self.api_client.select_header_content_type([])
122120

123121
response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params,
124122
body=body_params, post_params=form_params, files=files,
@@ -160,12 +158,12 @@ def get_order_by_id(self, order_id, **kwargs):
160158
body_params = None
161159

162160
# HTTP header `Accept`
163-
header_params['Accept'] = ApiClient.select_header_accept(['application/json', 'application/xml'])
161+
header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml'])
164162
if not header_params['Accept']:
165163
del header_params['Accept']
166164

167165
# HTTP header `Content-Type`
168-
header_params['Content-Type'] = ApiClient.select_header_content_type([])
166+
header_params['Content-Type'] = self.api_client.select_header_content_type([])
169167

170168
response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params,
171169
body=body_params, post_params=form_params, files=files,
@@ -207,12 +205,12 @@ def delete_order(self, order_id, **kwargs):
207205
body_params = None
208206

209207
# HTTP header `Accept`
210-
header_params['Accept'] = ApiClient.select_header_accept(['application/json', 'application/xml'])
208+
header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml'])
211209
if not header_params['Accept']:
212210
del header_params['Accept']
213211

214212
# HTTP header `Content-Type`
215-
header_params['Content-Type'] = ApiClient.select_header_content_type([])
213+
header_params['Content-Type'] = self.api_client.select_header_content_type([])
216214

217215
response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params,
218216
body=body_params, post_params=form_params, files=files,

0 commit comments

Comments
 (0)