tina4-python 0.2.16__tar.gz → 0.2.18__tar.gz

{tina4_python-0.2.16 → tina4_python-0.2.18}/PKG-INFO

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

{tina4_python-0.2.16 → tina4_python-0.2.18}/pyproject.toml

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

{tina4_python-0.2.16 → tina4_python-0.2.18}/tina4_python/Request.py

@@ -9,7 +9,7 @@ class Request:
     Request object to store parameters, headers, etc.
     """
 
-    def __init__(self, body=None, params=None, headers=None, request=None, raw=None):
+    def __init__(self, body=None, params=None, headers=None, request=None, raw_data=None, raw_request=None, raw_content=None):
         self.body = body if body is not None else None
         self.params = params if params is not None else {}
         self.headers = headers if headers is not None else {}
@@ -18,5 +18,7 @@ class Request:
         self.cookies = {}
         self.session = None
         self.files = {}
-        self.raw = raw if raw is not None else None
+        self.raw_data = raw_data if raw_data is not None else None
+        self.raw_request = raw_request if raw_request is not None else None
+        self.raw_content = raw_content if raw_content is not None else None
 

{tina4_python-0.2.16 → tina4_python-0.2.18}/tina4_python/Router.py

@@ -132,6 +132,9 @@ class Router:
                 Request.params = request["params"]
                 Request.body = request["body"] if "body" in request else None
                 Request.session = session
+                Request.raw_data = request["raw_data"] if "raw_data" in request else None
+                Request.raw_request = request["raw_request"] if "raw_request" in request else None
+                Request.raw_content = request["raw_content"] if "raw_content" in request else None
 
                 tina4_python.tina4_current_request = Request
                 old_stdout = sys.stdout # Memorize the default stdout stream

{tina4_python-0.2.16 → tina4_python-0.2.18}/tina4_python/Webserver.py

@@ -27,7 +27,7 @@ class Webserver:
 
     async def get_content_body(self, content_length):
         # get lines of content where at the end of the request
-        content = self.request_raw
+        content = self.content_raw
 
         if "content-type" in self.lowercase_headers:
             if self.lowercase_headers["content-type"] == "application/x-www-form-urlencoded":
@@ -111,7 +111,7 @@ class Webserver:
         else:
             body = None
 
-        request = {"params": params, "body": body, "raw": self.request, "headers": self.lowercase_headers}
+        request = {"params": params, "body": body, "raw_data": self.request, "headers": self.lowercase_headers, "raw_request": self.request_raw, "raw_content": self.content_raw}
 
         tina4_python.tina4_current_request = request
 
@@ -185,29 +185,31 @@ class Webserver:
             content_length = int(lowercase_headers["content-length"])
             count = 0
             read_size = 64
-            raw_data = b''
-            while len(raw_data) < content_length:
+            content_data = b''
+            while len(content_data) < content_length:
                 read = await reader.read(read_size)
                 count += len(read)
+                content_data += read
                 raw_data += read
                 # print('COUNT', count, len(read))
-                if len(read) < read_size and len(raw_data) == content_length:
+                if len(read) < read_size and len(content_data) == content_length:
                     break
             try:
-                content = raw_data.decode("utf-8")
+                content = content_data.decode("utf-8")
             except:  # probably binary or multipart form?
-                content = raw_data
+                content = content_data
 
-        return protocol, headers, lowercase_headers, content, raw_data
+        return protocol, headers, lowercase_headers, content, raw_data, content_data
 
     async def handle_client(self, reader, writer):
         # Get the client request
-        protocol, headers_list, lowercase_headers, request, raw_data = await self.get_data(reader)
+        protocol, headers_list, lowercase_headers, request, request_raw, content_raw = await self.get_data(reader)
         # Strange blank request ?
         if protocol == '':
             return
         # Decode the request
-        self.request_raw = raw_data
+        self.request_raw = request_raw
+        self.content_raw = content_raw
         self.request = request
         self.headers = headers_list
         self.lowercase_headers = lowercase_headers
@@ -249,6 +251,7 @@ class Webserver:
         writer.close()
 
     def __init__(self, host_name, port):
+        self.content_raw = None
         self.session = Session
         self.cookies = {}
         self.method = None