loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

feat: remove unused imports from python clients; fix discriminator

Browse Source
This commit is contained in:
Tomasz Prus
2018-05-19 00:29:50 +02:00
parent c0f85df44e
commit 3678eaff87
26 changed files with 19 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/openapi-generator/src/main/resources/python/model.mustache
View File

@@ -6,10 +6,6 @@ import pprint
import re # noqa: F401
import six
{{#imports}}{{#-first}}
{{/-first}}
{{import}} # noqa: F401,E501
{{/imports}}
{{#models}}
@@ -170,7 +166,7 @@ class {{classname}}(object):
{{#discriminator}}
def get_real_child_model(self, data):
"""Returns the real base class specified by the discriminator"""
discriminator_value = data[self.discriminator].lower()
discriminator_value = data[self.discriminator]
return self.discriminator_value_class_map.get(discriminator_value)
{{/discriminator}}

2
samples/client/petstore/python-asyncio/petstore_api/models/animal.py
View File

@@ -102,7 +102,7 @@ class Animal(object):
def get_real_child_model(self, data):
"""Returns the real base class specified by the discriminator"""
discriminator_value = data[self.discriminator].lower()
discriminator_value = data[self.discriminator]
return self.discriminator_value_class_map.get(discriminator_value)
def to_dict(self):

2
samples/client/petstore/python-asyncio/petstore_api/models/animal_farm.py
View File

@@ -15,8 +15,6 @@ import re # noqa: F401
import six
from petstore_api.models.animal import Animal # noqa: F401,E501
class AnimalFarm(object):
"""NOTE: This class is auto generated by OpenAPI Generator.

2
samples/client/petstore/python-asyncio/petstore_api/models/array_test.py
View File

@@ -15,8 +15,6 @@ import re # noqa: F401
import six
from petstore_api.models.read_only_first import ReadOnlyFirst # noqa: F401,E501
class ArrayTest(object):
"""NOTE: This class is auto generated by OpenAPI Generator.

2
samples/client/petstore/python-asyncio/petstore_api/models/cat.py
View File

@@ -15,8 +15,6 @@ import re # noqa: F401
import six
from petstore_api.models.animal import Animal # noqa: F401,E501
class Cat(object):
"""NOTE: This class is auto generated by OpenAPI Generator.

2
samples/client/petstore/python-asyncio/petstore_api/models/dog.py
View File

@@ -15,8 +15,6 @@ import re # noqa: F401
import six
from petstore_api.models.animal import Animal # noqa: F401,E501
class Dog(object):
"""NOTE: This class is auto generated by OpenAPI Generator.

2
samples/client/petstore/python-asyncio/petstore_api/models/enum_test.py
View File

@@ -15,8 +15,6 @@ import re # noqa: F401
import six
from petstore_api.models.outer_enum import OuterEnum # noqa: F401,E501
class EnumTest(object):
"""NOTE: This class is auto generated by OpenAPI Generator.

2
samples/client/petstore/python-asyncio/petstore_api/models/mixed_properties_and_additional_properties_class.py
View File

@@ -15,8 +15,6 @@ import re # noqa: F401
import six
from petstore_api.models.animal import Animal # noqa: F401,E501
class MixedPropertiesAndAdditionalPropertiesClass(object):
"""NOTE: This class is auto generated by OpenAPI Generator.

3
samples/client/petstore/python-asyncio/petstore_api/models/pet.py
View File

@@ -15,9 +15,6 @@ import re # noqa: F401
import six
from petstore_api.models.category import Category # noqa: F401,E501
from petstore_api.models.tag import Tag # noqa: F401,E501
class Pet(object):
"""NOTE: This class is auto generated by OpenAPI Generator.

2
samples/client/petstore/python-tornado/petstore_api/models/animal.py
View File

@@ -102,7 +102,7 @@ class Animal(object):
def get_real_child_model(self, data):
"""Returns the real base class specified by the discriminator"""
discriminator_value = data[self.discriminator].lower()
discriminator_value = data[self.discriminator]
return self.discriminator_value_class_map.get(discriminator_value)
def to_dict(self):

2
samples/client/petstore/python-tornado/petstore_api/models/animal_farm.py
View File

@@ -15,8 +15,6 @@ import re # noqa: F401
import six
from petstore_api.models.animal import Animal # noqa: F401,E501
class AnimalFarm(object):
"""NOTE: This class is auto generated by OpenAPI Generator.

2
samples/client/petstore/python-tornado/petstore_api/models/array_test.py
View File

@@ -15,8 +15,6 @@ import re # noqa: F401
import six
from petstore_api.models.read_only_first import ReadOnlyFirst # noqa: F401,E501
class ArrayTest(object):
"""NOTE: This class is auto generated by OpenAPI Generator.

2
samples/client/petstore/python-tornado/petstore_api/models/cat.py
View File

@@ -15,8 +15,6 @@ import re # noqa: F401
import six
from petstore_api.models.animal import Animal # noqa: F401,E501
class Cat(object):
"""NOTE: This class is auto generated by OpenAPI Generator.

2
samples/client/petstore/python-tornado/petstore_api/models/dog.py
View File

@@ -15,8 +15,6 @@ import re # noqa: F401
import six
from petstore_api.models.animal import Animal # noqa: F401,E501
class Dog(object):
"""NOTE: This class is auto generated by OpenAPI Generator.

2
samples/client/petstore/python-tornado/petstore_api/models/enum_test.py
View File

@@ -15,8 +15,6 @@ import re # noqa: F401
import six
from petstore_api.models.outer_enum import OuterEnum # noqa: F401,E501
class EnumTest(object):
"""NOTE: This class is auto generated by OpenAPI Generator.

2
samples/client/petstore/python-tornado/petstore_api/models/mixed_properties_and_additional_properties_class.py
View File

@@ -15,8 +15,6 @@ import re # noqa: F401
import six
from petstore_api.models.animal import Animal # noqa: F401,E501
class MixedPropertiesAndAdditionalPropertiesClass(object):
"""NOTE: This class is auto generated by OpenAPI Generator.

3
samples/client/petstore/python-tornado/petstore_api/models/pet.py
View File

@@ -15,9 +15,6 @@ import re # noqa: F401
import six
from petstore_api.models.category import Category # noqa: F401,E501
from petstore_api.models.tag import Tag # noqa: F401,E501
class Pet(object):
"""NOTE: This class is auto generated by OpenAPI Generator.

2
samples/client/petstore/python/petstore_api/models/animal.py
View File

@@ -102,7 +102,7 @@ class Animal(object):
def get_real_child_model(self, data):
"""Returns the real base class specified by the discriminator"""
discriminator_value = data[self.discriminator].lower()
discriminator_value = data[self.discriminator]
return self.discriminator_value_class_map.get(discriminator_value)
def to_dict(self):

2
samples/client/petstore/python/petstore_api/models/animal_farm.py
View File

@@ -15,8 +15,6 @@ import re # noqa: F401
import six
from petstore_api.models.animal import Animal # noqa: F401,E501
class AnimalFarm(object):
"""NOTE: This class is auto generated by OpenAPI Generator.

2
samples/client/petstore/python/petstore_api/models/array_test.py
View File

@@ -15,8 +15,6 @@ import re # noqa: F401
import six
from petstore_api.models.read_only_first import ReadOnlyFirst # noqa: F401,E501
class ArrayTest(object):
"""NOTE: This class is auto generated by OpenAPI Generator.

2
samples/client/petstore/python/petstore_api/models/cat.py
View File

@@ -15,8 +15,6 @@ import re # noqa: F401
import six
from petstore_api.models.animal import Animal # noqa: F401,E501
class Cat(object):
"""NOTE: This class is auto generated by OpenAPI Generator.

2
samples/client/petstore/python/petstore_api/models/dog.py
View File

@@ -15,8 +15,6 @@ import re # noqa: F401
import six
from petstore_api.models.animal import Animal # noqa: F401,E501
class Dog(object):
"""NOTE: This class is auto generated by OpenAPI Generator.

2
samples/client/petstore/python/petstore_api/models/enum_test.py
View File

@@ -15,8 +15,6 @@ import re # noqa: F401
import six
from petstore_api.models.outer_enum import OuterEnum # noqa: F401,E501
class EnumTest(object):
"""NOTE: This class is auto generated by OpenAPI Generator.

2
samples/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py
View File

@@ -15,8 +15,6 @@ import re # noqa: F401
import six
from petstore_api.models.animal import Animal # noqa: F401,E501
class MixedPropertiesAndAdditionalPropertiesClass(object):
"""NOTE: This class is auto generated by OpenAPI Generator.

3
samples/client/petstore/python/petstore_api/models/pet.py
View File

@@ -15,9 +15,6 @@ import re # noqa: F401
import six
from petstore_api.models.category import Category # noqa: F401,E501
from petstore_api.models.tag import Tag # noqa: F401,E501
class Pet(object):
"""NOTE: This class is auto generated by OpenAPI Generator.

15
samples/client/petstore/python/tests/test_deserialization.py
View File

@@ -71,6 +71,21 @@ class DeserializationTests(unittest.TestCase):
self.assertTrue(isinstance(deserialized, dict))
self.assertTrue(isinstance(deserialized['pet'], petstore_api.Pet))
def test_deserialize_dict_str_dog(self):
""" deserialize dict(str, Dog), use discriminator"""
data = {
'dog': {
"id": 0,
"className": "Dog",
"color": "white",
"bread": "Jack Russel Terrier"
}
}
deserialized = self.deserialize(data, 'dict(str, Animal)')
self.assertTrue(isinstance(deserialized, dict))
self.assertTrue(isinstance(deserialized['dog'], petstore_api.Dog))
def test_deserialize_dict_str_int(self):
""" deserialize dict(str, int) """
data = {