Change reserved word handling in python client.

* First, remove the beginning underscores.
* Then, append underscore if the var is reserved word or number.
This commit is contained in:
geekerzp
2015-08-19 17:48:04 +08:00
parent dc1992ad45
commit 894d571ea5
11 changed files with 62 additions and 72 deletions

View File

@@ -97,18 +97,17 @@ class Category(object):
"""
result = {}
for name, prop in iteritems(self.__dict__):
if name == "attribute_map" or name == "swagger_types":
continue
if isinstance(prop, list):
result[name[1:]] = list(map(
for attr, _ in iteritems(self.swagger_types):
value = getattr(self, attr)
if isinstance(value, list):
result[attr] = list(map(
lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
prop
value
))
elif hasattr(prop, "to_dict"):
result[name[1:]] = prop.to_dict()
elif hasattr(value, "to_dict"):
result[attr] = value.to_dict()
else:
result[name[1:]] = prop
result[attr] = value
return result

View File

@@ -203,18 +203,17 @@ class Order(object):
"""
result = {}
for name, prop in iteritems(self.__dict__):
if name == "attribute_map" or name == "swagger_types":
continue
if isinstance(prop, list):
result[name[1:]] = list(map(
for attr, _ in iteritems(self.swagger_types):
value = getattr(self, attr)
if isinstance(value, list):
result[attr] = list(map(
lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
prop
value
))
elif hasattr(prop, "to_dict"):
result[name[1:]] = prop.to_dict()
elif hasattr(value, "to_dict"):
result[attr] = value.to_dict()
else:
result[name[1:]] = prop
result[attr] = value
return result

View File

@@ -203,18 +203,17 @@ class Pet(object):
"""
result = {}
for name, prop in iteritems(self.__dict__):
if name == "attribute_map" or name == "swagger_types":
continue
if isinstance(prop, list):
result[name[1:]] = list(map(
for attr, _ in iteritems(self.swagger_types):
value = getattr(self, attr)
if isinstance(value, list):
result[attr] = list(map(
lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
prop
value
))
elif hasattr(prop, "to_dict"):
result[name[1:]] = prop.to_dict()
elif hasattr(value, "to_dict"):
result[attr] = value.to_dict()
else:
result[name[1:]] = prop
result[attr] = value
return result

View File

@@ -97,18 +97,17 @@ class Tag(object):
"""
result = {}
for name, prop in iteritems(self.__dict__):
if name == "attribute_map" or name == "swagger_types":
continue
if isinstance(prop, list):
result[name[1:]] = list(map(
for attr, _ in iteritems(self.swagger_types):
value = getattr(self, attr)
if isinstance(value, list):
result[attr] = list(map(
lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
prop
value
))
elif hasattr(prop, "to_dict"):
result[name[1:]] = prop.to_dict()
elif hasattr(value, "to_dict"):
result[attr] = value.to_dict()
else:
result[name[1:]] = prop
result[attr] = value
return result

View File

@@ -247,18 +247,17 @@ class User(object):
"""
result = {}
for name, prop in iteritems(self.__dict__):
if name == "attribute_map" or name == "swagger_types":
continue
if isinstance(prop, list):
result[name[1:]] = list(map(
for attr, _ in iteritems(self.swagger_types):
value = getattr(self, attr)
if isinstance(value, list):
result[attr] = list(map(
lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
prop
value
))
elif hasattr(prop, "to_dict"):
result[name[1:]] = prop.to_dict()
elif hasattr(value, "to_dict"):
result[attr] = value.to_dict()
else:
result[name[1:]] = prop
result[attr] = value
return result