added a third unpacked element (Content-type)

mauro-balades · Oct 2, 2021 · 7620eef · 7620eef
1 parent 5691655
commit 7620eef
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/expross/main.py b/expross/main.py
@@ -24,7 +24,6 @@
 from __future__ import absolute_import
 
 from expross.routes import Route
-from expross.errors import RouteAlreadyExists, RedirectPlease
 from expross.errors import ErrorHandlerExists, ErrorCodeExists
 from expross.error import ErrorHandler
 

diff --git a/expross/resource.py b/expross/resource.py
@@ -41,23 +41,27 @@ def _get_res_and_code(self):
         data = self.function()
 
         try:
-            res, code = data
+            res, code, content_type = data
         except ValueError:
-            res = data
-            code = 200
+            try:
+                content_type = None
+                res, code = data
+            except ValueError:
+                res = data
+                code = 200
 
-        return res, code
+        return res, code, content_type
 
     def on_get(self, req: Request, resp: Response):
         self._check_for_method("GET")
 
         self.app.req: Request = req
-        res, code = self._get_res_and_code()
+        res, code, content_type = self._get_res_and_code()
         data, type = get_response(res)
 
         resp.status = code
         resp.data = data
-        resp.content_type = type
+        resp.content_type = type if content_type is None else content_type
 
     def on_post(self, req: Request, resp: Response):
         self._check_for_method("POST")