tina4-python 0.2.112__tar.gz → 0.2.114__tar.gz

{tina4_python-0.2.112 → tina4_python-0.2.114}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tina4-python
-Version: 0.2.112
+Version: 0.2.114
 Summary: Tina4Python - This is not another framework for Python
 Author-email: Andre van Zuydam <andrevanzuydam@gmail.com>
 Requires-Python: <4.0,>=3.12

{tina4_python-0.2.112 → tina4_python-0.2.114}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tina4-python"
-version = "0.2.112"
+version = "0.2.114"
 description = "Tina4Python - This is not another framework for Python"
 authors = [
     {name = "Andre van Zuydam",email = "andrevanzuydam@gmail.com"}

{tina4_python-0.2.112 → tina4_python-0.2.114}/tina4_python/MiddleWare.py

@@ -4,6 +4,8 @@
 # License: MIT https://opensource.org/licenses/MIT
 #
 # flake8: noqa: E501
+import asyncio
+
 class MiddleWare:
     def __init__(self, middleware_class):
         """
@@ -35,7 +37,12 @@ class MiddleWare:
         """
         for method in self.before_methods:
             method = getattr(self.middleware_class, method)
-            request, response = await method(request, response)
+            result = method(request, response)
+            if asyncio.iscoroutine(result):
+                request, response = await result
+            else:
+                request, response = result
+
         return request, response
 
     async def call_after_methods(self, request, response):
@@ -47,7 +54,11 @@ class MiddleWare:
         """
         for method in self.after_methods:
             method = getattr(self.middleware_class, method)
-            request, response = await method(request, response)
+            result = method(request, response)
+            if asyncio.iscoroutine(result):
+                request, response = await result
+            else:
+                request, response = result
         return request, response
 
     async def call_any_methods(self, request, response):
@@ -59,7 +70,11 @@ class MiddleWare:
         """
         for method in self.any_methods:
             method = getattr(self.middleware_class, method)
-            request, response = await method(request, response)
+            result = method(request, response)
+            if asyncio.iscoroutine(result):
+                request, response = await result
+            else:
+                request, response = result
         return request, response
 
     def call_direct_method(self, request, response, method_name):

{tina4_python-0.2.112 → tina4_python-0.2.114}/tina4_python/Template.py

@@ -15,6 +15,7 @@ from jinja2 import Environment, FileSystemLoader, Undefined
 from tina4_python.Session import Session
 from random import random as RANDOM
 
+
 class Template:
     # initializes the twig template engine
     @staticmethod
@@ -30,11 +31,12 @@ class Template:
         Template.twig.globals['RANDOM'] = RANDOM
         Template.twig.globals['formToken'] = Template.get_form_token
         Template.twig.filters['formToken'] = Template.get_form_token_input
-        if Constant.TINA4_LOG_DEBUG in os.getenv("TINA4_DEBUG_LEVEL") or Constant.TINA4_LOG_ALL in os.getenv("TINA4_DEBUG_LEVEL"):
+        if Constant.TINA4_LOG_DEBUG in os.getenv("TINA4_DEBUG_LEVEL") or Constant.TINA4_LOG_ALL in os.getenv(
+                "TINA4_DEBUG_LEVEL"):
             Template.twig.globals['dump'] = Template.dump
         else:
             Template.twig.globals['dump'] = Template.production_dump
-        Debug("Twig Initialized on "+path, Constant.TINA4_LOG_INFO)
+        Debug("Twig Initialized on " + path, Constant.TINA4_LOG_INFO)
         return Template.twig
 
     @staticmethod
@@ -52,7 +54,7 @@ class Template:
                     return obj.session_values
                 raise TypeError("Type %s not serializable to Jinja2 template" % type(obj))
 
-            return "<pre>"+json.dumps(param, indent=True, default=json_serialize)+"</pre>"
+            return "<pre>" + json.dumps(param, indent=True, default=json_serialize) + "</pre>"
         else:
             return ""
 
@@ -62,7 +64,8 @@ class Template:
 
     @staticmethod
     def get_form_token_input(form_name):
-        return '<input type="hidden" name="formToken" value="'+Template.get_form_token({"formName": form_name})+'"><!--"'+str(datetime.now().isoformat())+'"-->'
+        return '<input type="hidden" name="formToken" value="' + Template.get_form_token(
+            {"formName": form_name}) + '"><!--"' + str(datetime.now().isoformat()) + '"-->'
 
     @staticmethod
     def convert_special_types(obj):
@@ -102,4 +105,3 @@ class Template:
     @staticmethod
     def render(template_or_file_name, data=None):
         return Template.render_twig_template(template_or_file_name, data)
-

{tina4_python-0.2.112 → tina4_python-0.2.114}/tina4_python/Webserver.py

@@ -52,13 +52,15 @@ class Webserver:
             elif self.lowercase_headers["content-type"] == "application/json":
                 # print("CONTENT", content, self.request)
                 try:
-                    return json.loads(content)
+                    return json.loads(content), {}
                 except Exception:
-                    return content.decode("utf-8")
+                    return content.decode("utf-8"), {}
+
             elif self.lowercase_headers["content-type"] == "text/plain":
-                return content.decode("utf-8")
+                return content.decode("utf-8"), {}
             else:
                 content_data = self.lowercase_headers["content-type"].split("; ")
+
                 if content_data[0] == "multipart/form-data":
                     boundary = content_data[1].split("=")[1] + "\r\n"
                     content = b"\r\n" + content
@@ -68,8 +70,10 @@ class Webserver:
                     for data in data_array:
                         data = data.split(b"\r\n\r\n")
                         data_names = data[0].decode("utf-8").split("; ")
+
                         if data_names[0] == "Content-Disposition: form-data":
                             key_name = data_names[1].split("=")[1][1:-1]
+
                             if len(data_names) == 2:
                                 data_value = data[1].split(b"\r\n")[0]
                                 body[key_name] = unquote_plus(data_value.decode("utf-8"))
@@ -92,7 +96,6 @@ class Webserver:
                                 if "Content-Type" in meta_data:
                                     content_type = meta_data["Content-Type"]
 
-
                                 if key_name in body:
                                     body[key_name] = [body[key_name]]
                                     body[key_name].append({"file_name": file_name, "content_type": content_type,"content": base64.encodebytes(data_value).decode("utf-8").replace(