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

This commit is contained in:
wing328 2016-07-07 19:13:29 +08:00
commit 41e8273cb8

View File

@ -183,7 +183,7 @@ class ApiClient(object):
Builds a JSON POST object. Builds a JSON POST object.
If obj is None, return None. If obj is None, return None.
If obj is str, int, float, bool, return directly. If obj is str, int, long, float, bool, return directly.
If obj is datetime.datetime, datetime.date If obj is datetime.datetime, datetime.date
convert to string in iso8601 format. convert to string in iso8601 format.
If obj is list, sanitize each element in the list. If obj is list, sanitize each element in the list.
@ -193,7 +193,7 @@ class ApiClient(object):
:param obj: The data to serialize. :param obj: The data to serialize.
:return: The serialized form of data. :return: The serialized form of data.
""" """
types = (str, int, float, bool, tuple) types = (str, int, long, float, bool, tuple)
if sys.version_info < (3, 0): if sys.version_info < (3, 0):
types = types + (unicode,) types = types + (unicode,)
if isinstance(obj, type(None)): if isinstance(obj, type(None)):
@ -269,14 +269,14 @@ class ApiClient(object):
# convert str to class # convert str to class
# for native types # for native types
if klass in ['int', 'float', 'str', 'bool', if klass in ['int', 'long', 'float', 'str', 'bool',
"date", 'datetime', "object"]: "date", 'datetime', "object"]:
klass = eval(klass) klass = eval(klass)
# for model types # for model types
else: else:
klass = eval('models.' + klass) klass = eval('models.' + klass)
if klass in [int, float, str, bool]: if klass in [int, long, float, str, bool]:
return self.__deserialize_primitive(data, klass) return self.__deserialize_primitive(data, klass)
elif klass == object: elif klass == object:
return self.__deserialize_object(data) return self.__deserialize_object(data)
@ -505,7 +505,7 @@ class ApiClient(object):
:param data: str. :param data: str.
:param klass: class literal. :param klass: class literal.
:return: int, float, str, bool. :return: int, long, float, str, bool.
""" """
try: try:
value = klass(data) value = klass(data)