Skip to content

[Python] Use Python 2.6 compatible dict definition #4443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
richardwhiuk wants to merge 2 commits into from
Closed

[Python] Use Python 2.6 compatible dict definition #4443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d55fee
[Python] Use Python 2.6 compatible dict definition
richardwhiuk Nov 10, 2019
06aac9b
Update samples
richardwhiuk Nov 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions modules/openapi-generator/src/main/resources/python/api_client.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,12 +231,12 @@ class ApiClient(object):
# and attributes which value is not None.
# Convert attribute name to json key in
# model definition for request.
obj_dict = {obj.attribute_map[attr]: getattr(obj, attr)
for attr, _ in six.iteritems(obj.openapi_types)
if getattr(obj, attr) is not None}
obj_dict = dict([(obj.attribute_map[attr], getattr(obj, attr))
for attr, _ in six.iteritems(obj.openapi_types)
if getattr(obj, attr) is not None])

return {key: self.sanitize_for_serialization(val)
for key, val in six.iteritems(obj_dict)}
return dict([(key, self.sanitize_for_serialization(val))
for key, val in six.iteritems(obj_dict)])

def deserialize(self, response, response_type):
"""Deserializes response into an object.
Expand Down Expand Up @@ -279,8 +279,8 @@ class ApiClient(object):

if klass.startswith('dict('):
sub_kls = re.match(r'dict\(([^,]*), (.*)\)', klass).group(2)
return {k: self.__deserialize(v, sub_kls)
for k, v in six.iteritems(data)}
return dict([(k, self.__deserialize(v, sub_kls))
for k, v in six.iteritems(data)])

# convert str to class
if klass in self.NATIVE_TYPES_MAPPING:
Expand Down
14 changes: 7 additions & 7 deletions samples/client/petstore/python-asyncio/petstore_api/api_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,12 +224,12 @@ def sanitize_for_serialization(self, obj):
# and attributes which value is not None.
# Convert attribute name to json key in
# model definition for request.
obj_dict = {obj.attribute_map[attr]: getattr(obj, attr)
for attr, _ in six.iteritems(obj.openapi_types)
if getattr(obj, attr) is not None}
obj_dict = dict([(obj.attribute_map[attr], getattr(obj, attr))
for attr, _ in six.iteritems(obj.openapi_types)
if getattr(obj, attr) is not None])

return {key: self.sanitize_for_serialization(val)
for key, val in six.iteritems(obj_dict)}
return dict([(key, self.sanitize_for_serialization(val))
for key, val in six.iteritems(obj_dict)])

def deserialize(self, response, response_type):
"""Deserializes response into an object.
Expand Down Expand Up @@ -272,8 +272,8 @@ def __deserialize(self, data, klass):

if klass.startswith('dict('):
sub_kls = re.match(r'dict\(([^,]*), (.*)\)', klass).group(2)
return {k: self.__deserialize(v, sub_kls)
for k, v in six.iteritems(data)}
return dict([(k, self.__deserialize(v, sub_kls))
for k, v in six.iteritems(data)])

# convert str to class
if klass in self.NATIVE_TYPES_MAPPING:
Expand Down
14 changes: 7 additions & 7 deletions samples/client/petstore/python-tornado/petstore_api/api_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,12 +226,12 @@ def sanitize_for_serialization(self, obj):
# and attributes which value is not None.
# Convert attribute name to json key in
# model definition for request.
obj_dict = {obj.attribute_map[attr]: getattr(obj, attr)
for attr, _ in six.iteritems(obj.openapi_types)
if getattr(obj, attr) is not None}
obj_dict = dict([(obj.attribute_map[attr], getattr(obj, attr))
for attr, _ in six.iteritems(obj.openapi_types)
if getattr(obj, attr) is not None])

return {key: self.sanitize_for_serialization(val)
for key, val in six.iteritems(obj_dict)}
return dict([(key, self.sanitize_for_serialization(val))
for key, val in six.iteritems(obj_dict)])

def deserialize(self, response, response_type):
"""Deserializes response into an object.
Expand Down Expand Up @@ -274,8 +274,8 @@ def __deserialize(self, data, klass):

if klass.startswith('dict('):
sub_kls = re.match(r'dict\(([^,]*), (.*)\)', klass).group(2)
return {k: self.__deserialize(v, sub_kls)
for k, v in six.iteritems(data)}
return dict([(k, self.__deserialize(v, sub_kls))
for k, v in six.iteritems(data)])

# convert str to class
if klass in self.NATIVE_TYPES_MAPPING:
Expand Down
14 changes: 7 additions & 7 deletions samples/client/petstore/python/petstore_api/api_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,12 +224,12 @@ def sanitize_for_serialization(self, obj):
# and attributes which value is not None.
# Convert attribute name to json key in
# model definition for request.
obj_dict = {obj.attribute_map[attr]: getattr(obj, attr)
for attr, _ in six.iteritems(obj.openapi_types)
if getattr(obj, attr) is not None}
obj_dict = dict([(obj.attribute_map[attr], getattr(obj, attr))
for attr, _ in six.iteritems(obj.openapi_types)
if getattr(obj, attr) is not None])

return {key: self.sanitize_for_serialization(val)
for key, val in six.iteritems(obj_dict)}
return dict([(key, self.sanitize_for_serialization(val))
for key, val in six.iteritems(obj_dict)])

def deserialize(self, response, response_type):
"""Deserializes response into an object.
Expand Down Expand Up @@ -272,8 +272,8 @@ def __deserialize(self, data, klass):

if klass.startswith('dict('):
sub_kls = re.match(r'dict\(([^,]*), (.*)\)', klass).group(2)
return {k: self.__deserialize(v, sub_kls)
for k, v in six.iteritems(data)}
return dict([(k, self.__deserialize(v, sub_kls))
for k, v in six.iteritems(data)])

# convert str to class
if klass in self.NATIVE_TYPES_MAPPING:
Expand Down