Merge branch 'maneeshsahu-master'

This commit is contained in:
wing328 2016-07-07 22:17:59 +08:00
commit 82c3963f62
3 changed files with 27 additions and 11 deletions

View File

@ -46,6 +46,14 @@ except ImportError:
# for python2 # for python2
from urllib import quote from urllib import quote
# special handling of `long` (python2 only)
try:
# Python 2
long
except NameError:
# Python 3
long = int
from .configuration import Configuration from .configuration import Configuration
@ -183,7 +191,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 +201,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 +277,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 +513,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)

View File

@ -5,7 +5,7 @@ This Python package is automatically generated by the [Swagger Codegen](https://
- API version: 1.0.0 - API version: 1.0.0
- Package version: 1.0.0 - Package version: 1.0.0
- Build date: 2016-07-06T16:27:27.842+08:00 - Build date: 2016-07-07T22:03:52.761+08:00
- Build package: class io.swagger.codegen.languages.PythonClientCodegen - Build package: class io.swagger.codegen.languages.PythonClientCodegen
## Requirements. ## Requirements.

View File

@ -46,6 +46,14 @@ except ImportError:
# for python2 # for python2
from urllib import quote from urllib import quote
# special handling of `long` (python2 only)
try:
# Python 2
long
except NameError:
# Python 3
long = int
from .configuration import Configuration from .configuration import Configuration
@ -183,7 +191,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 +201,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 +277,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 +513,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)