Return full text response

jacebrowning · jacebrowning · commit 68ac576e2931 · 2017-03-20T17:12:43.000-04:00
diff --git a/flask_api/__init__.py b/flask_api/__init__.py
@@ -1,3 +1,3 @@
 from flask_api.app import FlaskAPI
 
-__version__ = '0.7b1'
+__version__ = '0.7b2'
diff --git a/flask_api/app.py b/flask_api/app.py
@@ -1,7 +1,7 @@
 # coding: utf8
 from __future__ import unicode_literals
 from flask import request, Flask, Blueprint
-from flask._compat import reraise, string_types
+from flask._compat import reraise, string_types, text_type
 from flask_api.exceptions import APIException
 from flask_api.request import APIRequest
 from flask_api.response import APIResponse
@@ -55,7 +55,7 @@ def make_response(self, rv):
             headers, status_or_headers = status_or_headers, None
 
         if not isinstance(rv, self.response_class):
-            if isinstance(rv, (bytes, bytearray, list, dict)):
+            if isinstance(rv, (text_type, bytes, bytearray, list, dict)):
                 rv = self.response_class(rv, headers=headers, status=status_or_headers)
                 headers = status_or_headers = None
             else:
diff --git a/flask_api/response.py b/flask_api/response.py
@@ -1,6 +1,7 @@
 # coding: utf8
 from __future__ import unicode_literals
 from flask import request, Response
+from flask._compat import text_type
 
 
 class APIResponse(Response):
@@ -20,7 +21,7 @@ def __init__(self, content=None, *args, **kwargs):
         # From `werkzeug.wrappers.BaseResponse`
         if content is None:
             content = []
-        if isinstance(content, (bytes, bytearray)):
+        if isinstance(content, (text_type, bytes, bytearray)):
             self.set_data(content)
         else:
             self.response = content

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`from flask_api.app import FlaskAPI`
`2`	`2`
`3`		`-__version__ = '0.7b1'`
	`3`	`+__version__ = '0.7b2'`