PyWSGIRef 1.1.18__tar.gz → 1.1.20__tar.gz

{pywsgiref-1.1.18/src/PyWSGIRef.egg-info → pywsgiref-1.1.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyWSGIRef
-Version: 1.1.18
+Version: 1.1.20
 Summary: easy server-setup
 Author-email: Leander Kafemann <leander.kafemann+python@icloud.com>
 Project-URL: Homepage, https://github.com/LeanderKafemann/PyWSGIRef
@@ -96,7 +96,8 @@ html = loadFromFile('index.pyhtml')
 html = loadFromWeb('https://example.com/index.pyhtml')
 ```
 This is useful for serving dynamic HTML content in your WSGI application.<br/>
-The funcs are callable unless you set up a server.
+The funcs are callable unless you set up a server.<br/>
+You can also add multiple PyHTML files from the web at the same time using the <code>multiWebInit</code> function.
 ### Using Templates
 PyWSGIRef also provides a simple way to use templates in your WSGI application:
 ```python
@@ -200,5 +201,8 @@ Currently to be tested are:<br/>
 - application object running time measuring<br/>
 - application object counter of access<br/><br/>
 
+
+Please report any bugs you find in the GitHub repository and suggest new features!<br/><br/>
+
 Thanks a lot for helping improving PyWSGIRef!
 ### More coming soon

{pywsgiref-1.1.18 → pywsgiref-1.1.20}/README.md

@@ -79,7 +79,8 @@ html = loadFromFile('index.pyhtml')
 html = loadFromWeb('https://example.com/index.pyhtml')
 ```
 This is useful for serving dynamic HTML content in your WSGI application.<br/>
-The funcs are callable unless you set up a server.
+The funcs are callable unless you set up a server.<br/>
+You can also add multiple PyHTML files from the web at the same time using the <code>multiWebInit</code> function.
 ### Using Templates
 PyWSGIRef also provides a simple way to use templates in your WSGI application:
 ```python
@@ -183,5 +184,8 @@ Currently to be tested are:<br/>
 - application object running time measuring<br/>
 - application object counter of access<br/><br/>
 
+
+Please report any bugs you find in the GitHub repository and suggest new features!<br/><br/>
+
 Thanks a lot for helping improving PyWSGIRef!
 ### More coming soon

{pywsgiref-1.1.18 → pywsgiref-1.1.20}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "PyWSGIRef"
-version = "1.1.18"
+version = "1.1.20"
 authors = [
   {name="Leander Kafemann", email="leander.kafemann+python@icloud.com" },
 ]

{pywsgiref-1.1.18 → pywsgiref-1.1.20}/src/PyWSGIRef/__init__.py

@@ -18,7 +18,7 @@ def about():
     """
     Returns information about your release and other projects by Leander Kafemann
     """
-    return {"Version": (1, 1, 18), "Author": "Leander Kafemann", "date": "08.11.2025",\
+    return {"Version": (1, 1, 20), "Author": "Leander Kafemann", "date": "26.08.2026",\
             "recommend": ("pyimager"), "feedbackTo": "leander.kafemann+python@icloud.com"}
 
 SCHABLONEN = TemplateDict()
@@ -33,6 +33,21 @@ def addSchablone(name: str, content: str):
         raise ServerAlreadyGeneratedError()
     SCHABLONEN[name] = PyHTML(content)
 
+def multiWebInit(baseURL: str, templateNames: list[str], overrideException: bool = False) -> list[str]:
+    """
+    Loads multiple templates from the web and adds them to the SCHABLONEN dictionary.
+    Returns a list of the names of the loaded templates.
+    """
+    if finished.value and not overrideException:
+        raise ServerAlreadyGeneratedError()
+    loadedTemplates = []
+    for name in templateNames:
+        url = f"{baseURL}/{name}.pyhtml"
+        content = loadFromWeb(url, overrideException=overrideException)
+        addSchablone(name, content)
+        loadedTemplates.append(name)
+    return loadedTemplates
+
 def makeApplicationObject(contentGeneratingFunction: Callable, advanced: bool = False, setAdvancedHeaders: bool = False,\
                           getIP: bool = False, vercelPythonHosting: bool = False, getStats: bool = False,
                           advancedStats: bool = False, customEncoding: bool = False) -> Callable:
@@ -51,6 +66,7 @@ def makeApplicationObject(contentGeneratingFunction: Callable, advanced: bool =
     if not callable(contentGeneratingFunction):
         raise InvalidCallableError()
     BETA.lock()
+
     def simpleApplication(environ, start_response) -> list:
         """
         A simple WSGI application object that serves as a template.
@@ -61,8 +77,13 @@ def makeApplicationObject(contentGeneratingFunction: Callable, advanced: bool =
             STATS.count.increase()
             perfTime = STATS.startPerfTime("applicationCallNr"+str(STATS.count.count))
         storage = FieldStorage(fp=environ.get("wsgi.input"), environ=environ, keep_blank_values=True)
-        if storage.getvalue("realAccessDeviceMonitorAgent", "") not in ["PyWSGIRef/1.1", ""]:
-            raise OutdatedPyWSGIRefVersionError("Access with outdated PyWSGIRef version detected. Please update to the latest version.")
+        try:
+            if storage.getvalue("realAccessDeviceMonitorAgent", "") not in ["PyWSGIRef/1.1", ""]:
+                raise OutdatedPyWSGIRefVersionError("Access with outdated PyWSGIRef version detected. Please update to the latest version.")
+        except TypeError:
+            pass
+        except:
+            raise InvalidEnvironError("Invalid WSGI environ and/or FieldStorage keys detected.")
         type_ = "text/html" 
         status = "200 OK"
         if advanced:
@@ -98,6 +119,7 @@ def makeApplicationObject(contentGeneratingFunction: Callable, advanced: bool =
         else:
             if customEncoding:
                 raise VercelIncompabilityError("customEncoding cannot be used with vercelPythonHosting.")
+
     return simpleApplication
 
 def setUpServer(application: Callable, port: int = 8000) -> WSGIServer:

{pywsgiref-1.1.18 → pywsgiref-1.1.20}/src/PyWSGIRef/exceptions.py

@@ -100,5 +100,13 @@ class OutdatedPyWSGIRefVersionError(Exception):
     Raised when the PyWSGIRef version is outdated and does not support a requested feature.
     """
     def __init__(self, message="The PyWSGIRef version is outdated and does not support this feature."):
+        self.message = message
+        super().__init__(self.message)
+
+class InvalidEnvironError(Exception):
+    """
+    Raised when the WSGI environ is invalid or missing required keys.
+    """
+    def __init__(self, message="Invalid WSGI environ."):
         self.message = message
         super().__init__(self.message)

{pywsgiref-1.1.18 → pywsgiref-1.1.20}/src/PyWSGIRef/pyhtml.py

@@ -1,4 +1,3 @@
-import html
 import re
 from naturalsize import replStrPassage
 
@@ -62,21 +61,29 @@ class PyHTML:
         """
         Replaces script replacement phrases with JS scripts.
         """
+        offset = 0
         for match in re.finditer(SCRIPT_PATTERN, self.html, re.DOTALL):
             idx, idxEnd = match.span()
+            idx += offset
+            idxEnd += offset
             script_content = match.group(1).strip()
             replacement = f"<script>{script_content}</script>"
             self.html = self.html[:idx] + replacement + self.html[idxEnd:]
+            offset += len(replacement) - (idxEnd - idx)
 
     def _replace_style_blocks(self):
         """
         Replaces style replacement phrases with CSS styles.
         """
+        offset = 0
         for match in re.finditer(STYLE_PATTERN, self.html, re.DOTALL):
             idx, idxEnd = match.span()
+            idx += offset
+            idxEnd += offset
             style_content = match.group(1).strip()
             replacement = f"<style>{style_content}</style>"
             self.html = self.html[:idx] + replacement + self.html[idxEnd:]
+            offset += len(replacement) - (idxEnd - idx)
 
     def _replace_eval_blocks(self):
         """
@@ -85,23 +92,26 @@ class PyHTML:
         """
         if self.context is None:
             self.context = {}
+        offset = 0
         for match in re.finditer(EVAL_BLOCK_PATTERN, self.html, re.DOTALL):
             idx, idxEnd = match.span()
+            idx += offset
+            idxEnd += offset
             code = match.group(1).strip()
             try:
-                # eval f�r Ausdr�cke, exec f�r Statements
                 result = str(eval(code, {}, self.context))
             except Exception as e:
                 result = f"<b>EvalError: {e}</b>"
             self.html = self.html[:idx] + result + self.html[idxEnd:]
+            offset += len(result) - (idxEnd - idx)
 
     def _replace_if_blocks(self, context=None):
         """
         Replaces with html code based on the evaluation of conditions in if blocks.
         """
         if context is None:
-            context = {}
-        # re.DOTALL f�r mehrzeilige Bl�cke
+            context = self.context if self.context else {}
+        
         while True:
             match = re.search(IF_BLOCK_PATTERN, self.html, re.DOTALL)
             if not match:

{pywsgiref-1.1.18 → pywsgiref-1.1.20}/src/PyWSGIRef/stats.py

@@ -1,10 +1,10 @@
 import datetime
 
 class PerformanceTime:
-    def __init__(self, title: str, data: dict = {}):
+    def __init__(self, title: str, data: dict = None):
         self.start = datetime.datetime.now()
         self.title = title
-        self.data = data
+        self.data = data if data is not None else {}
     def stop(self):
         self.end = datetime.datetime.now()
 
@@ -56,7 +56,8 @@ class Stats:
                     lines.append(f"  {i}. {title}: started at {start} (not stopped until now)")
                 else:
                     lines.append(f"  {i}. {title}: (no time data)")
-                lines[-1] = lines[-1] + " data: " + ", ".join(f"{k}={v}" for k, v in perf.data.items())
+                if perf.data:
+                    lines[-1] = lines[-1] + " data: " + ", ".join(f"{k}={v}" for k, v in perf.data.items())
         result = "\n".join(lines) if not html else "<br>".join(lines)
         if filename:
             if not filename.endswith(".pywsgirefstats"):

{pywsgiref-1.1.18 → pywsgiref-1.1.20/src/PyWSGIRef.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyWSGIRef
-Version: 1.1.18
+Version: 1.1.20
 Summary: easy server-setup
 Author-email: Leander Kafemann <leander.kafemann+python@icloud.com>
 Project-URL: Homepage, https://github.com/LeanderKafemann/PyWSGIRef
@@ -96,7 +96,8 @@ html = loadFromFile('index.pyhtml')
 html = loadFromWeb('https://example.com/index.pyhtml')
 ```
 This is useful for serving dynamic HTML content in your WSGI application.<br/>
-The funcs are callable unless you set up a server.
+The funcs are callable unless you set up a server.<br/>
+You can also add multiple PyHTML files from the web at the same time using the <code>multiWebInit</code> function.
 ### Using Templates
 PyWSGIRef also provides a simple way to use templates in your WSGI application:
 ```python
@@ -200,5 +201,8 @@ Currently to be tested are:<br/>
 - application object running time measuring<br/>
 - application object counter of access<br/><br/>
 
+
+Please report any bugs you find in the GitHub repository and suggest new features!<br/><br/>
+
 Thanks a lot for helping improving PyWSGIRef!
 ### More coming soon