Fix serialisation problem with return codes when used with flask-restful (#168)

* Create the response object then set the response code on the response
by unpacking the tuple or default to 200.
Return a tuple consisting only of the response object allowing
flask-restful to unpack and serialise the response properly.

* Fix indentation

* Update changelog

Co-authored-by: Steven Loria <[email protected]>

Author: AdamLeyshon

CHANGELOG.rst

@@ -1,6 +1,14 @@
 Changelog
 ---------
 
+0.8.7 (unreleased)
+******************
+
+Bug fixes:
+
+* Fix serialisation problem with return codes when used with flask-restful  (:issue:`98`, :issue:`93`).
+  Thanks :user:`AdamLeyshon` for the PR.
+
 0.8.6 (2020-03-01)
 ******************
 
@@ -25,6 +33,7 @@ Bug fixes:
 
 * Fix passing ``default_in`` argument when generating parameters (:issue:`165`).
   Thanks :user:`d42` for reporting and thanks :user:`zzz4zzz` for the fix.
+>>>>>>> master
 
 0.8.3 (2019-09-17)
 ******************

flask_apispec/wrapper.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
+from flask import Response
+
 try:
     from collections.abc import Mapping
 except ImportError:  # Python 2
     from collections import Mapping
 
-
 import flask
 import marshmallow as ma
 import werkzeug
@@ -13,17 +14,18 @@
 
 from flask_apispec import utils
 
-
 MARSHMALLOW_VERSION_INFO = tuple(
     [int(part) for part in ma.__version__.split('.') if part.isdigit()]
 )
 
+
 class Wrapper(object):
     """Apply annotations to a view function.
 
     :param func: View function to wrap
     :param instance: Optional instance or parent
     """
+
     def __init__(self, func, instance=None):
         self.func = func
         self.instance = instance
@@ -49,7 +51,7 @@ def call_view(self, *args, **kwargs):
                 elif isinstance(parsed, Mapping):
                     kwargs.update(parsed)
                 else:
-                    args += (parsed, )
+                    args += (parsed,)
 
         return self.func(*args, **kwargs)
 
@@ -65,14 +67,20 @@ def marshal_result(self, unpacked, status_code):
             output = dumped.data if MARSHMALLOW_VERSION_INFO[0] < 3 else dumped
         else:
             output = unpacked[0]
-        return format_output((format_response(output), ) + unpacked[1:])
+
+        response_object = format_response(output)  # type: Response
+        response_object.status_code = unpacked[1] or 200
+        return format_output((response_object,))
+
 
 def identity(value):
     return value
 
+
 def unpack(resp):
-    resp = resp if isinstance(resp, tuple) else (resp, )
-    return resp + (None, ) * (3 - len(resp))
+    resp = resp if isinstance(resp, tuple) else (resp,)
+    return resp + (None,) * (3 - len(resp))
+
 
 def format_output(values):
     while values[-1] is None: