Fixed unicode error and supported allow_nonstandard_methods in tornad…

…o based python client (#7560) * fixing "decoding Unicode is not supported" error for py2 when data is unicode * allowing nonstandard methods for tornado python client. * Making sure to return unicode when needed
OpenAPITools · Feb 2, 2018 · dfbef43 · dfbef43
1 parent ea27924
commit dfbef43
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/modules/swagger-codegen/src/main/resources/python/api_client.mustache b/modules/swagger-codegen/src/main/resources/python/api_client.mustache
@@ -547,7 +547,7 @@ class ApiClient(object):
         try:
             return klass(data)
         except UnicodeEncodeError:
-            return six.u(data)
+            return six.text_type(data)
         except TypeError:
             return data
 

diff --git a/modules/swagger-codegen/src/main/resources/python/tornado/rest.mustache b/modules/swagger-codegen/src/main/resources/python/tornado/rest.mustache
@@ -83,7 +83,7 @@ class RESTClientObject(object):
                 "body parameter cannot be used with post_params parameter."
             )
 
-        request = httpclient.HTTPRequest(url)
+        request = httpclient.HTTPRequest(url, allow_nonstandard_methods=True)
         request.ca_certs = self.ca_certs
         request.client_key = self.client_key
         request.client_cert = self.client_cert

diff --git a/samples/client/petstore-security-test/python/petstore_api/api_client.py b/samples/client/petstore-security-test/python/petstore_api/api_client.py
@@ -541,7 +541,7 @@ def __deserialize_primitive(self, data, klass):
         try:
             return klass(data)
         except UnicodeEncodeError:
-            return six.u(data)
+            return six.text_type(data)
         except TypeError:
             return data
 

diff --git a/samples/client/petstore/python-asyncio/petstore_api/api_client.py b/samples/client/petstore/python-asyncio/petstore_api/api_client.py
@@ -541,7 +541,7 @@ def __deserialize_primitive(self, data, klass):
         try:
             return klass(data)
         except UnicodeEncodeError:
-            return six.u(data)
+            return six.text_type(data)
         except TypeError:
             return data
 

diff --git a/samples/client/petstore/python-tornado/petstore_api/api_client.py b/samples/client/petstore/python-tornado/petstore_api/api_client.py
@@ -543,7 +543,7 @@ def __deserialize_primitive(self, data, klass):
         try:
             return klass(data)
         except UnicodeEncodeError:
-            return six.u(data)
+            return six.text_type(data)
         except TypeError:
             return data
 

diff --git a/samples/client/petstore/python/petstore_api/api_client.py b/samples/client/petstore/python/petstore_api/api_client.py
@@ -541,7 +541,7 @@ def __deserialize_primitive(self, data, klass):
         try:
             return klass(data)
         except UnicodeEncodeError:
-            return six.u(data)
+            return six.text_type(data)
         except TypeError:
             return data