python-fragments 0.8__tar.gz → 0.10__tar.gz

{python_fragments-0.8 → python_fragments-0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fragments
-Version: 0.8
+Version: 0.10
 Summary: Modern HTML template rendering in Python
 Author-email: The Running Algorithm <services@therunningalgorithm.info>
 License: Proprietary

{python_fragments-0.8 → python_fragments-0.10}/fragments/grammar.py

@@ -4,11 +4,10 @@ import re
 from fragments.ast_nodes import ASTFragment, ASTHTMLAttribute, ASTHTMLComment, ASTHTMLElement, ASTHTMLText, ASTInterpolation, ASTModule, ASTPython
 from fragments.source import Source
 
-PYTHON = r"([\s\S]*?)(?=<>)|[\s\S]*$"
 IDENTIFIER = r"[a-zA-Z_][a-zA-Z0-9_]*"
 STRING_CONTENTS = r"(.*?)(?=\")"
 HTML_IDENTIFIER = r"[a-zA-Z][a-zA-Z0-9_-]*"
-HTML_TEXT = r"(.*?)(?=<)"
+HTML_TEXT = r"(.*?)(?=<|{{)"
 
 
 class ParsingError(Exception):
@@ -56,8 +55,29 @@ def expect_module(source: Source) -> tuple[Source, ASTModule]:
 
 def expect_python(source: Source) -> tuple[Source, ASTPython]:
     """Vanilla Python code."""
+    PYTHON = r"([\s\S]*?)(?=<>|'''|\"\"\"|'|\"|#)|[\s\S]*$"
     source_start: int = source.offset
-    source, python = expect_regex(source, PYTHON, "python source")
+    python: str = ""
+
+    while not source.remaining().startswith("<>") and not source.at_end():
+        source, next_python = expect_regex(source, PYTHON, "python source")
+        python += next_python
+        if source.remaining().startswith('"""'):
+            source, next_python = expect_regex(source, r'"""([\s\S]*?)(?:"""|$)', "python source")
+            python += next_python
+        elif source.remaining().startswith("'''"):
+            source, next_python = expect_regex(source, r"'''([\s\S]*?)(?:'''|$)", "python source")
+            python += next_python
+        elif source.remaining().startswith("'"):
+            source, next_python = expect_regex(source, r"'(?:[^'\\]|\\.)*(?:'|$)", "python source")
+            python += next_python
+        elif source.remaining().startswith('"'):
+            source, next_python = expect_regex(source, r'"(?:[^"\\]|\\.)*(?:"|$)', "python source")
+            python += next_python
+        elif source.remaining().startswith("#"):
+            source, next_python = expect_regex(source, r"#[^\n]*", "python source")
+            python += next_python
+
     return source, ASTPython(source_start, source.offset, python)
 
 

{python_fragments-0.8 → python_fragments-0.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-fragments"
-version = "0.8"
+version = "0.10"
 description = "Modern HTML template rendering in Python"
 authors = [{ name = "The Running Algorithm", email = "services@therunningalgorithm.info" }]
 readme = "README.md"

{python_fragments-0.8 → python_fragments-0.10}/python_fragments.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fragments
-Version: 0.8
+Version: 0.10
 Summary: Modern HTML template rendering in Python
 Author-email: The Running Algorithm <services@therunningalgorithm.info>
 License: Proprietary