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

Merge branch 'master' of https://github.com/swagger-api/swagger-codegen

Browse Source
This commit is contained in:
wing328 2017-08-02 17:23:43 +08:00
commit e9285e31e1
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java
View File

@ -41,7 +41,7 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig
// clear import mapping (from default generator) as python does not use it // clear import mapping (from default generator) as python does not use it
// at the moment // at the moment
importMapping.clear(); importMapping.clear();
supportsInheritance = true; supportsInheritance = true;
modelPackage = "models"; modelPackage = "models";
apiPackage = "api"; apiPackage = "api";

22
modules/swagger-codegen/src/main/resources/python/api_client.mustache
View File

@ -593,17 +593,23 @@ class ApiClient(object):
:param klass: class literal. :param klass: class literal.
:return: model object. :return: model object.
""" """
if not klass.swagger_types:
if not klass.swagger_types and not hasattr(klass, 'get_real_child_model'):
return data return data
kwargs = {} kwargs = {}
for attr, attr_type in iteritems(klass.swagger_types): if klass.swagger_types is not None:
if data is not None \ for attr, attr_type in iteritems(klass.swagger_types):
and klass.attribute_map[attr] in data \ if data is not None \
and isinstance(data, (list, dict)): and klass.attribute_map[attr] in data \
value = data[klass.attribute_map[attr]] and isinstance(data, (list, dict)):
kwargs[attr] = self.__deserialize(value, attr_type) value = data[klass.attribute_map[attr]]
kwargs[attr] = self.__deserialize(value, attr_type)
instance = klass(**kwargs) instance = klass(**kwargs)
if hasattr(instance, 'get_real_child_model'):
klass_name = instance.get_real_child_model(data)
if klass_name:
instance = self.__deserialize(data, klass_name)
return instance return instance