Skip to content

Commit 82176f1

Browse files
frantumafrantuma
committed
fix python api client indentation and line split
1 parent 473e28b commit 82176f1

File tree

12 files changed

+25
-56
lines changed

12 files changed

+25
-56
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ class ApiClient(object):
598598
)
599599

600600
def __hasattr(self, object, name):
601-
return name in object.__class__.__dict__
601+
return name in object.__class__.__dict__
602602

603603
def __deserialize_model(self, data, klass):
604604
"""Deserializes list or dict to model.
@@ -608,7 +608,8 @@ class ApiClient(object):
608608
:return: model object.
609609
"""
610610

611-
if not klass.swagger_types and not self.__hasattr(klass, 'get_real_child_model'):
611+
if (not klass.swagger_types and
612+
not self.__hasattr(klass, 'get_real_child_model')):
612613
return data
613614

614615
kwargs = {}

‎samples/client/petstore-security-test/python/petstore_api/api_client.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,8 @@ def __deserialize_model(self, data, klass):
602602
:return: model object.
603603
"""
604604

605-
if not klass.swagger_types and not self.__hasattr(klass, 'get_real_child_model'):
605+
if not klass.swagger_types and not \
606+
self.__hasattr(klass, 'get_real_child_model'):
606607
return data
607608

608609
kwargs = {}

‎samples/client/petstore/python-asyncio/.swagger-codegen/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.0-SNAPSHOT
1+
2.4.2-SNAPSHOT

‎samples/client/petstore/python-asyncio/petstore_api/api_client.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -591,6 +591,9 @@ def __deserialize_datatime(self, string):
591591
)
592592
)
593593

594+
def __hasattr(self, object, name):
595+
return name in object.__class__.__dict__
596+
594597
def __deserialize_model(self, data, klass):
595598
"""Deserializes list or dict to model.
596599
@@ -599,8 +602,8 @@ def __deserialize_model(self, data, klass):
599602
:return: model object.
600603
"""
601604

602-
if not klass.swagger_types and not hasattr(klass,
603-
'get_real_child_model'):
605+
if (not klass.swagger_types and
606+
not self.__hasattr(klass, 'get_real_child_model')):
604607
return data
605608

606609
kwargs = {}
@@ -620,7 +623,7 @@ def __deserialize_model(self, data, klass):
620623
for key, value in data.items():
621624
if key not in klass.swagger_types:
622625
instance[key] = value
623-
if hasattr(instance, 'get_real_child_model'):
626+
if self.__hasattr(instance, 'get_real_child_model'):
624627
klass_name = instance.get_real_child_model(data)
625628
if klass_name:
626629
instance = self.__deserialize(data, klass_name)

‎samples/client/petstore/python-tornado/.swagger-codegen/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.0-SNAPSHOT
1+
2.4.2-SNAPSHOT

‎samples/client/petstore/python-tornado/petstore_api/api_client.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,9 @@ def __deserialize_datatime(self, string):
593593
)
594594
)
595595

596+
def __hasattr(self, object, name):
597+
return name in object.__class__.__dict__
598+
596599
def __deserialize_model(self, data, klass):
597600
"""Deserializes list or dict to model.
598601
@@ -601,8 +604,8 @@ def __deserialize_model(self, data, klass):
601604
:return: model object.
602605
"""
603606

604-
if not klass.swagger_types and not hasattr(klass,
605-
'get_real_child_model'):
607+
if (not klass.swagger_types and
608+
not self.__hasattr(klass, 'get_real_child_model')):
606609
return data
607610

608611
kwargs = {}
@@ -622,7 +625,7 @@ def __deserialize_model(self, data, klass):
622625
for key, value in data.items():
623626
if key not in klass.swagger_types:
624627
instance[key] = value
625-
if hasattr(instance, 'get_real_child_model'):
628+
if self.__hasattr(instance, 'get_real_child_model'):
626629
klass_name = instance.get_real_child_model(data)
627630
if klass_name:
628631
instance = self.__deserialize(data, klass_name)

‎samples/client/petstore/python/.swagger-codegen/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.0-SNAPSHOT
1+
2.4.2-SNAPSHOT

‎samples/client/petstore/python/petstore_api/api_client.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ def __deserialize_datatime(self, string):
592592
)
593593

594594
def __hasattr(self, object, name):
595-
return name in object.__class__.__dict__
595+
return name in object.__class__.__dict__
596596

597597
def __deserialize_model(self, data, klass):
598598
"""Deserializes list or dict to model.
@@ -602,7 +602,8 @@ def __deserialize_model(self, data, klass):
602602
:return: model object.
603603
"""
604604

605-
if not klass.swagger_types and not self.__hasattr(klass, 'get_real_child_model'):
605+
if (not klass.swagger_types and
606+
not self.__hasattr(klass, 'get_real_child_model')):
606607
return data
607608

608609
kwargs = {}

‎samples/server/petstore/flaskConnexion-python2/.swagger-codegen/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.0-SNAPSHOT
1+
2.4.2-SNAPSHOT

‎samples/server/petstore/flaskConnexion-python2/swagger_server/swagger/swagger.yaml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ paths:
5959
- "write:pets"
6060
- "read:pets"
6161
x-swagger-router-controller: "swagger_server.controllers.pet_controller"
62-
x-is-post-method: true
6362
put:
6463
tags:
6564
- "pet"
@@ -91,7 +90,6 @@ paths:
9190
- "write:pets"
9291
- "read:pets"
9392
x-swagger-router-controller: "swagger_server.controllers.pet_controller"
94-
x-is-put-method: true
9593
/pet/findByStatus:
9694
get:
9795
tags:
@@ -130,7 +128,6 @@ paths:
130128
- "write:pets"
131129
- "read:pets"
132130
x-swagger-router-controller: "swagger_server.controllers.pet_controller"
133-
x-is-get-method: true
134131
/pet/findByTags:
135132
get:
136133
tags:
@@ -166,7 +163,6 @@ paths:
166163
- "read:pets"
167164
deprecated: true
168165
x-swagger-router-controller: "swagger_server.controllers.pet_controller"
169-
x-is-get-method: true
170166
/pet/{petId}:
171167
get:
172168
tags:
@@ -196,7 +192,6 @@ paths:
196192
security:
197193
- api_key: []
198194
x-swagger-router-controller: "swagger_server.controllers.pet_controller"
199-
x-is-get-method: true
200195
post:
201196
tags:
202197
- "pet"
@@ -233,7 +228,6 @@ paths:
233228
- "write:pets"
234229
- "read:pets"
235230
x-swagger-router-controller: "swagger_server.controllers.pet_controller"
236-
x-is-post-method: true
237231
delete:
238232
tags:
239233
- "pet"
@@ -262,7 +256,6 @@ paths:
262256
- "write:pets"
263257
- "read:pets"
264258
x-swagger-router-controller: "swagger_server.controllers.pet_controller"
265-
x-is-delete-method: true
266259
/pet/{petId}/uploadImage:
267260
post:
268261
tags:
@@ -301,7 +294,6 @@ paths:
301294
- "write:pets"
302295
- "read:pets"
303296
x-swagger-router-controller: "swagger_server.controllers.pet_controller"
304-
x-is-post-method: true
305297
/store/inventory:
306298
get:
307299
tags:
@@ -323,7 +315,6 @@ paths:
323315
security:
324316
- api_key: []
325317
x-swagger-router-controller: "swagger_server.controllers.store_controller"
326-
x-is-get-method: true
327318
/store/order:
328319
post:
329320
tags:
@@ -349,7 +340,6 @@ paths:
349340
400:
350341
description: "Invalid Order"
351342
x-swagger-router-controller: "swagger_server.controllers.store_controller"
352-
x-is-post-method: true
353343
/store/order/{orderId}:
354344
get:
355345
tags:
@@ -380,7 +370,6 @@ paths:
380370
404:
381371
description: "Order not found"
382372
x-swagger-router-controller: "swagger_server.controllers.store_controller"
383-
x-is-get-method: true
384373
delete:
385374
tags:
386375
- "store"
@@ -403,7 +392,6 @@ paths:
403392
404:
404393
description: "Order not found"
405394
x-swagger-router-controller: "swagger_server.controllers.store_controller"
406-
x-is-delete-method: true
407395
/user:
408396
post:
409397
tags:
@@ -425,7 +413,6 @@ paths:
425413
default:
426414
description: "successful operation"
427415
x-swagger-router-controller: "swagger_server.controllers.user_controller"
428-
x-is-post-method: true
429416
/user/createWithArray:
430417
post:
431418
tags:
@@ -449,7 +436,6 @@ paths:
449436
default:
450437
description: "successful operation"
451438
x-swagger-router-controller: "swagger_server.controllers.user_controller"
452-
x-is-post-method: true
453439
/user/createWithList:
454440
post:
455441
tags:
@@ -473,7 +459,6 @@ paths:
473459
default:
474460
description: "successful operation"
475461
x-swagger-router-controller: "swagger_server.controllers.user_controller"
476-
x-is-post-method: true
477462
/user/login:
478463
get:
479464
tags:
@@ -512,7 +497,6 @@ paths:
512497
400:
513498
description: "Invalid username/password supplied"
514499
x-swagger-router-controller: "swagger_server.controllers.user_controller"
515-
x-is-get-method: true
516500
/user/logout:
517501
get:
518502
tags:
@@ -528,7 +512,6 @@ paths:
528512
default:
529513
description: "successful operation"
530514
x-swagger-router-controller: "swagger_server.controllers.user_controller"
531-
x-is-get-method: true
532515
/user/{username}:
533516
get:
534517
tags:
@@ -555,7 +538,6 @@ paths:
555538
404:
556539
description: "User not found"
557540
x-swagger-router-controller: "swagger_server.controllers.user_controller"
558-
x-is-get-method: true
559541
put:
560542
tags:
561543
- "user"
@@ -583,7 +565,6 @@ paths:
583565
404:
584566
description: "User not found"
585567
x-swagger-router-controller: "swagger_server.controllers.user_controller"
586-
x-is-put-method: true
587568
delete:
588569
tags:
589570
- "user"
@@ -605,7 +586,6 @@ paths:
605586
404:
606587
description: "User not found"
607588
x-swagger-router-controller: "swagger_server.controllers.user_controller"
608-
x-is-delete-method: true
609589
securityDefinitions:
610590
petstore_auth:
611591
type: "oauth2"

0 commit comments

Comments
 (0)