tina4-python 0.2.24__tar.gz → 0.2.26__tar.gz

{tina4_python-0.2.24 → tina4_python-0.2.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tina4-python
-Version: 0.2.24
+Version: 0.2.26
 Summary: Tina4Python - This is not another framework for Python
 Author: Andre van Zuydam
 Author-email: andrevanzuydam@gmail.com

{tina4_python-0.2.24 → tina4_python-0.2.26}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tina4-python"
-version = "0.2.24"
+version = "0.2.26"
 description = "Tina4Python - This is not another framework for Python"
 authors = ["Andre van Zuydam <andrevanzuydam@gmail.com>"]
 readme = "README.md"

{tina4_python-0.2.24 → tina4_python-0.2.26}/tina4_python/.env

@@ -4,3 +4,4 @@ VERSION=1.0.0
 TINA4_LANGUAGE=en
 TINA4_SECRET=ABCDEF
 TINA4_DEBUG_LEVEL=[TINA4_LOG_ALL]
+API_KEY=f9ca99e18c7bce9c6852df4257a3280b

{tina4_python-0.2.24 → tina4_python-0.2.26}/tina4_python/Debug.py

@@ -66,7 +66,8 @@ class Debug:
                 print(output, "", end="")
             print()
 
-            sys.stdout.flush()
+            if sys.stdout is not None:
+                sys.stdout.flush()
 
         handler.flush()
         logger.removeHandler(handler)

{tina4_python-0.2.24 → tina4_python-0.2.26}/tina4_python/Response.py

@@ -16,21 +16,19 @@ content = ""
 http_code = Constant.HTTP_OK
 content_type = Constant.TEXT_HTML
 
+
 class Response:
     def __init__(self, content_in=None, http_code_in=None, content_type_in=None,
-                headers_in=None):
+                 headers_in=None):
         global headers
         global content
         global http_code
         global content_type
 
-        if content is not None:
-            content_in = content + content_in
-
         if (not isinstance(content_in, bool) and not isinstance(content_in, object)
-              and not isinstance(content_in,bytes)
-              and not isinstance(content_in, str)
-              and not isinstance(content_in, list) and inspect.isclass(type(content_in))):
+                and not isinstance(content_in, bytes)
+                and not isinstance(content_in, str)
+                and not isinstance(content_in, list) and inspect.isclass(type(content_in))):
             content_in = dict(content_in)
 
         # check if database result
@@ -53,6 +51,9 @@ class Response:
             content_in = json.dumps({"error": "Cannot decode object of type " + str(type(content_in))})
             content_type = Constant.APPLICATION_JSON
 
+        if content is not None and isinstance(content_in, str):
+            content_in = content + content_in
+
         self.headers = headers_in if headers_in is not None else headers
         self.content = content_in if content_in is not None else content
         self.http_code = http_code_in if http_code_in is not None else http_code
@@ -90,5 +91,3 @@ class Response:
         """
         global headers
         headers[key] = value
-
-

{tina4_python-0.2.24 → tina4_python-0.2.26}/tina4_python/Router.py

@@ -66,6 +66,7 @@ class Router:
         Response.headers = {}
         Response.content = ""
         Response.http_code = Constant.HTTP_OK
+        Response.content_type = Constant.TEXT_HTML
         result = None
 
         Debug("Root Path " + tina4_python.root_path + " " + url, method, Constant.TINA4_LOG_DEBUG)
@@ -121,6 +122,7 @@ class Router:
                 return Response.Response(file.read(), Constant.HTTP_OK, mime_type)
 
         old_stdout = None
+        buffer = io.StringIO()
         for route in tina4_python.tina4_routes.values():
             if route["method"] != method:
                 continue
@@ -178,7 +180,6 @@ class Router:
                         if not route["cache"]["cached"]:
                             result.headers["Cache-Control"] = "max-age=1, must-revalidate"
                             result.headers["Pragma"] = "no-cache"
-                            result.headers["Clear-Site-Data"] = "cache"
                         else:
                             result.headers["Cache-Control"] = "max-age=" + str(
                                 route["cache"]["max_age"]) + ", must-revalidate"
@@ -190,7 +191,11 @@ class Router:
                 break
 
         if result is None:
-            sys.stdout = old_stdout
+            if old_stdout is not None:
+                sys.stdout = old_stdout
+            else:
+                sys.stdout = buffer = io.StringIO()
+
             try:
                 return Response.Response(json.loads(buffer.getvalue()), Constant.HTTP_OK, Constant.APPLICATION_JSON)
             except: