Return Response object using current_app.make_resposne

Author: c-kruse

flask_apispec/wrapper.py

@@ -34,9 +34,10 @@ def __call__(self, *args, **kwargs):
         response = self.call_view(*args, **kwargs)
         if isinstance(response, werkzeug.Response):
             return response
-        unpacked = unpack(response)
-        status_code = unpacked[1] or http.OK
-        return self.marshal_result(unpacked, status_code)
+        rv, status_code, headers = unpack(response)
+        mv = self.marshal_result(rv, status_code)
+        resposne = packed(mv, status_code, headers)
+        return flask.current_app.make_response(resposne)
 
     def call_view(self, *args, **kwargs):
         config = flask.current_app.config
@@ -55,34 +56,48 @@ def call_view(self, *args, **kwargs):
 
         return self.func(*args, **kwargs)
 
-    def marshal_result(self, unpacked, status_code):
+    def marshal_result(self, result, status_code):
         config = flask.current_app.config
         format_response = config.get('APISPEC_FORMAT_RESPONSE', flask.jsonify) or identity
         annotation = utils.resolve_annotations(self.func, 'schemas', self.instance)
         schemas = utils.merge_recursive(annotation.options)
         schema = schemas.get(status_code, schemas.get('default'))
         if schema and annotation.apply is not False:
             schema = utils.resolve_schema(schema['schema'], request=flask.request)
-            dumped = schema.dump(unpacked[0])
+            dumped = schema.dump(result)
             output = dumped.data if MARSHMALLOW_VERSION_INFO[0] < 3 else dumped
         else:
-            output = unpacked[0]
+            output = result
 
-        response_object = format_response(output)  # type: Response
-        response_object.status_code = unpacked[1] or 200
-        return format_output((response_object,))
+        return format_response(output) # type: Response
 
 
 def identity(value):
     return value
 
 
 def unpack(resp):
-    resp = resp if isinstance(resp, tuple) else (resp,)
-    return resp + (None,) * (3 - len(resp))
-
-
-def format_output(values):
-    while values[-1] is None:
-        values = values[:-1]
-    return values if len(values) > 1 else values[0]
+    data = headers = None
+    status_code = 200
+    if isinstance(resp, tuple):
+        data = resp[0]
+        len_resp = len(resp)
+        if len_resp == 3:
+            status_code, headers = resp[1:]
+        elif len_resp == 2:
+            if isinstance(resp[1], (werkzeug.datastructures.Headers, dict, tuple, list)):
+                headers = resp[1]
+            else:
+                status_code = resp[1]
+    else:
+        data = resp
+    return data, status_code, headers
+
+
+def packed(data, status_code, headers):
+    resp = (data, )
+    if status_code:
+        resp += (status_code, )
+    if headers:
+        resp += (headers, )
+    return resp