Fix python / tornado body handling (#7738)

* Handle empty body

* Update petstore

modules/swagger-codegen/src/main/resources/python/tornado/rest.mustache

@@ -20,11 +20,19 @@ logger = logging.getLogger(__name__)
 
 class RESTResponse(io.IOBase):
 
-    def __init__(self, resp, data):
+    def __init__(self, resp):
         self.tornado_response = resp
         self.status = resp.code
         self.reason = resp.reason
-        self.data = data
+
+        if resp.body:
+            # In Python 3, the response body is utf-8 encoded bytes.
+            if six.PY3:
+                self.data = resp.body.decode('utf-8')
+            else:
+                self.data = resp.body
+        else:
+            self.data = None
 
     def getheaders(self):
         """Returns a CIMultiDictProxy of the response headers."""
@@ -83,7 +91,8 @@ class RESTClientObject(object):
                 "body parameter cannot be used with post_params parameter."
             )
 
-        request = httpclient.HTTPRequest(url, allow_nonstandard_methods=True)
+        request = httpclient.HTTPRequest(url)
+        request.allow_nonstandard_methods = True
         request.ca_certs = self.ca_certs
         request.client_key = self.client_key
         request.client_cert = self.client_cert
@@ -128,11 +137,7 @@ class RESTClientObject(object):
 
         if _preload_content:
 
-            r = RESTResponse(r, r.body)
-            # In the python 3, the response.data is bytes.
-            # we need to decode it to string.
-            if six.PY3:
-                r.data = r.data.decode('utf8')
+            r = RESTResponse(r)
 
             # log response body
             logger.debug("response body: %s", r.data)

samples/client/petstore/python-tornado/petstore_api/rest.py

@@ -29,11 +29,19 @@
 
 class RESTResponse(io.IOBase):
 
-    def __init__(self, resp, data):
+    def __init__(self, resp):
         self.tornado_response = resp
         self.status = resp.code
         self.reason = resp.reason
-        self.data = data
+
+        if resp.body:
+            # In Python 3, the response body is utf-8 encoded bytes.
+            if six.PY3:
+                self.data = resp.body.decode('utf-8')
+            else:
+                self.data = resp.body
+        else:
+            self.data = None
 
     def getheaders(self):
         """Returns a CIMultiDictProxy of the response headers."""
@@ -92,7 +100,8 @@ def request(self, method, url, query_params=None, headers=None, body=None,
                 "body parameter cannot be used with post_params parameter."
             )
 
-        request = httpclient.HTTPRequest(url, allow_nonstandard_methods=True)
+        request = httpclient.HTTPRequest(url)
+        request.allow_nonstandard_methods = True
         request.ca_certs = self.ca_certs
         request.client_key = self.client_key
         request.client_cert = self.client_cert
@@ -137,11 +146,7 @@ def request(self, method, url, query_params=None, headers=None, body=None,
 
         if _preload_content:
 
-            r = RESTResponse(r, r.body)
-            # In the python 3, the response.data is bytes.
-            # we need to decode it to string.
-            if six.PY3:
-                r.data = r.data.decode('utf8')
+            r = RESTResponse(r)
 
             # log response body
             logger.debug("response body: %s", r.data)