python-liquid 2.3.2__py3-none-any.whl → 2.3.3__py3-none-any.whl

liquid/__init__.py

@@ -56,7 +56,7 @@ from .tag import Tag
 
 from . import future
 
-__version__ = "2.3.2"
+__version__ = "2.3.3"
 
 __all__ = (
     "AwareBoundTemplate",

liquid/builtin/expressions/logical.py

@@ -310,12 +310,12 @@ class LeExpression(Expression):
     def evaluate(self, context: RenderContext) -> object:
         left = self.left.evaluate(context)
         right = self.right.evaluate(context)
-        return _eq(left, right) or _lt(self.token, left, right)
+        return _le(left, right)
 
     async def evaluate_async(self, context: RenderContext) -> object:
         left = await self.left.evaluate_async(context)
         right = await self.right.evaluate_async(context)
-        return _eq(left, right) or _lt(self.token, left, right)
+        return _le(left, right)
 
     def children(self) -> list[Expression]:
         return [self.left, self.right]
@@ -335,12 +335,12 @@ class GeExpression(Expression):
     def evaluate(self, context: RenderContext) -> object:
         left = self.left.evaluate(context)
         right = self.right.evaluate(context)
-        return _eq(left, right) or _lt(self.token, right, left)
+        return _le(right, left)
 
     async def evaluate_async(self, context: RenderContext) -> object:
         left = await self.left.evaluate_async(context)
         right = await self.right.evaluate_async(context)
-        return _eq(left, right) or _lt(self.token, right, left)
+        return _le(right, left)
 
     def children(self) -> list[Expression]:
         return [self.left, self.right]
@@ -583,6 +583,12 @@ def is_truthy(obj: object) -> bool:
 
 
 def _eq(left: object, right: object) -> bool:
+    if is_undefined(left):
+        return right is None or is_undefined(right)
+
+    if is_undefined(right):
+        return left is None or is_undefined(left)
+
     if hasattr(left, "__liquid__"):
         left = left.__liquid__()
 
@@ -612,14 +618,14 @@ def _lt(token: Token, left: object, right: object) -> bool:
     if isinstance(left, str) and isinstance(right, str):
         return left < right
 
-    if isinstance(left, bool) or isinstance(right, bool):
-        return False
-
     if isinstance(left, (int, float, Decimal)) and isinstance(
         right, (int, float, Decimal)
     ):
         return left < right
 
+    if left is None or right is None:
+        return False
+
     raise LiquidTypeError(
         f"'<' and '>' are not supported between '{left.__class__.__name__}' "
         f"and '{right.__class__.__name__}'",
@@ -627,6 +633,30 @@ def _lt(token: Token, left: object, right: object) -> bool:
     )
 
 
+def _le(left: object, right: object) -> bool:
+    if hasattr(left, "__liquid__"):
+        left = left.__liquid__()
+
+    if hasattr(right, "__liquid__"):
+        right = right.__liquid__()
+
+    if isinstance(left, str) and isinstance(right, str):
+        return left < right
+
+    if isinstance(left, bool) or isinstance(right, bool):
+        return False
+
+    if isinstance(left, (int, float, Decimal)) and isinstance(
+        right, (int, float, Decimal)
+    ):
+        return left < right
+
+    if left is None or right is None:
+        return False
+
+    return _eq(left, right)
+
+
 def _contains(token: Token, left: object, right: object) -> bool:
     if not is_truthy(left) or not is_truthy(right):
         return False

liquid/builtin/expressions/primitive.py

@@ -237,12 +237,12 @@ class RangeLiteral(Expression):
     def _make_range(self, start: Any, stop: Any) -> range:
         try:
             start = to_int(start)
-        except ValueError:
+        except (ValueError, TypeError):
             start = 0
 
         try:
             stop = to_int(stop)
-        except ValueError:
+        except (ValueError, TypeError):
             stop = 0
 
         # Descending ranges don't work

liquid/builtin/tags/tablerow_tag.py

@@ -189,6 +189,10 @@ class TablerowNode(Node):
         name = self.expression.identifier
         loop_iter, length = self.expression.evaluate(context)
 
+        if not length:
+            # An empty iterable renders no rows.
+            return True
+
         if self.expression.cols:
             cols = self._int_or_zero(self.expression.cols.evaluate(context))
         else:
@@ -204,7 +208,7 @@ class TablerowNode(Node):
         buffer.write('<tr class="row1">\n')
         _break = False
 
-        with context.extend(namespace):
+        with context.loop(namespace, tablerow):
             for item in tablerow:
                 namespace[name] = item
                 buffer.write(f'<td class="col{tablerow.col}">')

liquid/context.py

@@ -39,6 +39,7 @@ from .utils import ReadOnlyChainMap
 
 if TYPE_CHECKING:
     from .builtin.tags.for_tag import ForLoop
+    from .builtin.tags.tablerow_tag import TableRow
     from .environment import Environment
     from .template import BoundTemplate
     from .token import Token
@@ -108,8 +109,10 @@ class RenderContext:
             "macros": {},
         }
 
-        # As stack of forloop objects. Used for populating forloop.parentloop.
-        self.loops: list[ForLoop] = []
+        # As stack of loop objects. Used for populating forloop.parentloop and
+        # calculating the effective loop count for the loop iteration resource
+        # limit.
+        self.loops: list[Union[ForLoop, TableRow]] = []
 
         # A list of tags names that are disallowed in this context. For example,
         # partial templates rendered using the "render" tag are not allowed to
@@ -368,7 +371,7 @@ class RenderContext:
 
     @contextmanager
     def loop(
-        self, namespace: Mapping[str, object], forloop: ForLoop
+        self, namespace: Mapping[str, object], forloop: ForLoop | TableRow
     ) -> Iterator[RenderContext]:
         """Just like `Context.extend`, but keeps track of ForLoop objects too."""
         self.raise_for_loop_limit(forloop.length)
@@ -381,10 +384,11 @@ class RenderContext:
 
     def parentloop(self) -> Union[Undefined, object]:
         """Return the last ForLoop object from the loop stack."""
-        try:
-            return self.loops[-1]
-        except IndexError:
-            return self.env.undefined("parentloop", token=None)
+        for loop in reversed(self.loops):
+            if hasattr(loop, "parentloop"):
+                return loop
+
+        return self.env.undefined("parentloop", token=None)
 
     def raise_for_loop_limit(self, length: int = 1) -> None:
         """Raise a `LoopIterationLimitError` if loop stack is bigger than the limit."""

liquid/lex.py

@@ -54,14 +54,21 @@ def compile_liquid_rules(
         rf"{tag_s}-?\s*enddoc\s*(?P<rsd>-?){tag_e}"
     )
 
-    output_pattern = rf"{stmt_s}-?\s*(?P<stmt>.*?)\s*(?P<rss>-?){stmt_e}"
+    output_pattern = (
+        rf"{stmt_s}-?\s*"
+        rf"(?P<stmt>(?:(?!-?{stmt_e})[\s\S])*(?<!\s))\s*"
+        rf"(?P<rss>-?){stmt_e}"
+    )
 
     # The "name" group is zero or more characters so that a malformed tag (one
     # with no name) does not get treated as a literal.
     #
     # The `#` in the `name` group is specifically for the inline comment tag.
     tag_pattern = (
-        rf"{tag_s}-?(?P<pre>\s*(?P<name>#|\w*)\s*)(?P<expr>.*?)\s*(?P<rst>-?){tag_e}"
+        rf"{tag_s}-?\s*"
+        rf"(?P<name>#|\w+)\s*"
+        rf"(?P<expr>(?:(?!-?{tag_e})[\s\S])*(?<!\s))\s*"
+        rf"(?P<rst>-?){tag_e}"
     )
 
     if not comment_start_string:
@@ -157,6 +164,7 @@ def _tokenize_template(source: str, rules: Pattern[str]) -> Iterator[Token]:  #
 
             lstrip = bool(match.group("rss"))
             continue
+
         elif kind == "TAG":
             name = match.group("name")
             yield Token(
@@ -219,7 +227,7 @@ def _tokenize_template(source: str, rules: Pattern[str]) -> Iterator[Token]:  #
                 )
             if value.startswith(r"{%"):
                 raise LiquidSyntaxError(
-                    "expected '%}', found end of file",
+                    "missing tag name or closing delimiter",
                     token=Token(
                         TOKEN_EOF,
                         value=match.group(),

{python_liquid-2.3.2.dist-info → python_liquid-2.3.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: python-liquid
-Version: 2.3.2
+Version: 2.3.3
 Summary: A Python engine for the Liquid template language.
 Project-URL: Change Log, https://github.com/jg-rp/liquid/blob/main/CHANGES.md
 Project-URL: Documentation, https://jg-rp.github.io/liquid/

{python_liquid-2.3.2.dist-info → python_liquid-2.3.3.dist-info}/RECORD

@@ -1,12 +1,12 @@
-liquid/__init__.py,sha256=qJCQnUp4SFeIjlrsTo6I07bqqVUFptfOj9xbwHXb3nQ,7696
+liquid/__init__.py,sha256=1vgDH9TV0Poss1BQ7fe7GKVSEmrjInlgjMEsMOX0P98,7696
 liquid/analyze_tags.py,sha256=Uc1nueKLRiIejs2JyQIC7u2pxp9l-5HJAMWlg-Qj1m8,7615
 liquid/ast.py,sha256=4ZqSbuW4mv9IvoIMPk3OICUaOI1vPh8P8uFCrXI_3XA,8140
-liquid/context.py,sha256=fEuMsj9MVguX3Kzy9_k99TWekOwAToL0RtbGm9yZ71o,21718
+liquid/context.py,sha256=GYMG5-u3JI3w1jN_osEtyNsjziWgjBBMFZTilJEMap0,21931
 liquid/environment.py,sha256=7lq5Y6jAaN6dzWMbqXYnUcSBuOke768xoPidP-WK2Y4,24157
 liquid/exceptions.py,sha256=NNEWqVdY2QCjCvTtfqnV0_b1C0jL96IHOn6NlnabBXY,8451
 liquid/expression.py,sha256=Ozgajah2R5eg1yWA4ITFGaMFoOLt8GIjkE1NKqbBEzk,1143
 liquid/filter.py,sha256=3NtqGk6nHNwe6ux3X6ZIzzcEMJNA_SaMrBmMQA8hf-I,6735
-liquid/lex.py,sha256=PrnnUWhXZO6novkO0KE-p4virh5cNJsg7m85sg2IUiw,8004
+liquid/lex.py,sha256=vM8mU7OnqH_nLlvnT0S3GJT2VxdnXjRXr_TRkp2y2ZE,8139
 liquid/limits.py,sha256=BxqiC4Ax5iadmh6jDRcUNjFfOvbMkvZ1a046R1Cb8UA,1700
 liquid/loader.py,sha256=R_RniSRszCXmRVZgXlu9WjV130cWvspVcC3vIVpf-qg,4381
 liquid/messages.py,sha256=r6OcJG4-dLEULc9JtQ-mh3Jf6nNZ9Aa2reun7zYiUyc,11861
@@ -32,10 +32,10 @@ liquid/builtin/expressions/__init__.py,sha256=5scdgzOrMK9SxKpab3ebJnfO56Dl4bYLXO
 liquid/builtin/expressions/_tokenize.py,sha256=p7RbeOg8iwXDnW0fIL4_7FSrBulkPYrCm3ialpEIsDE,5737
 liquid/builtin/expressions/arguments.py,sha256=hlZh7LLFT5UismTo7mTlVjM87_ihUJo0BYuCxyTwKMI,6448
 liquid/builtin/expressions/filtered.py,sha256=FqPNZLjwDdlCfivtBa7e0wuQYwcJdKUl3_UY9AS3zG4,13073
-liquid/builtin/expressions/logical.py,sha256=S8T9IgsuWgv0s7GYcGvIJFOqYMiMFRpat7zF3nCZHR0,20388
+liquid/builtin/expressions/logical.py,sha256=sVjmg6IZAEzlj8j_UzyDetPRlrxqOeF_HhlKDSsAzZc,20980
 liquid/builtin/expressions/loop.py,sha256=F2mBD9_bXtarzmEKstak_u50cXF9ijlKs9Ip2Q_BbsQ,8839
 liquid/builtin/expressions/path.py,sha256=m1J33uIuEFlUaRXR_-G6qcsClOm0B5jbTZ0Pdt1P7Ak,5703
-liquid/builtin/expressions/primitive.py,sha256=Gzaeb-dF84zsMn5ZYhe-FOosnSbkkM2C6JLqjLvK5ns,11352
+liquid/builtin/expressions/primitive.py,sha256=MTREfbutdN-N0gDYrWrtP8X2cEUFUW3rs6nJmqv37rU,11378
 liquid/builtin/filters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 liquid/builtin/filters/array.py,sha256=jy35hoouAWI1yG2JX5OMG39Az2dmP--4IcuwqT59JMY,10281
 liquid/builtin/filters/extra.py,sha256=m13_1nbZyRBl3CZV9WWGLlUZueRPt8cKPEHRAioqM_o,2710
@@ -66,7 +66,7 @@ liquid/builtin/tags/increment_tag.py,sha256=SV2nrbE90l4iz36WCROqGE0RkkzztWUpU1_P
 liquid/builtin/tags/inline_comment_tag.py,sha256=hLLtvaI-VpJxzFeoLTwDTj46g13A1ke6blqVo2MP0Cs,1357
 liquid/builtin/tags/liquid_tag.py,sha256=o3ybbBmjIY94y_PpOUbgSwktENrGJ-jhZ124-rTlM4Q,5524
 liquid/builtin/tags/render_tag.py,sha256=iYWjKYQBmGHQVQ9OZgPZvVhraygFdmPzITin7cKJI5E,14309
-liquid/builtin/tags/tablerow_tag.py,sha256=qE5hIrlJXdKiLJ0u1YLgjnqt6GedWujfcfIO0b9x0d8,8947
+liquid/builtin/tags/tablerow_tag.py,sha256=IFG3G8e2zn94H-qFtlCaqYK46msNybp3LqbSlNIsI84,9052
 liquid/builtin/tags/unless_tag.py,sha256=udlHvVxILJsYfDaWRkj6Ynmnz2-2FF5RfkP0eizXt7k,6932
 liquid/extra/__init__.py,sha256=KrE9DAkwCAOLIaBHt73pnL6sb1tN5-UEKoQsX1b43Gg,2886
 liquid/extra/filters/__init__.py,sha256=tsEfSmaJvd6xN8DfKISPOm_KcHOmBVc4RSQqViD8NvY,733
@@ -90,7 +90,7 @@ liquid/utils/chain_map.py,sha256=nxkw3wwF6ddlGarIuL7Ii2elm4dU80LySgdQx1oift0,151
 liquid/utils/html.py,sha256=TmqOOpRMsy7fqZLj7X5ybd_XQnWW2YDAVDwTP1Gwf40,1706
 liquid/utils/lru_cache.py,sha256=p7bXOGaUwJpLsREI2lGSzK6lLna5W_k_zNXKWnPJdos,4022
 liquid/utils/text.py,sha256=1SwDECNMaqnnZ05je_AZZgxqzZd6U-mvq5jNU3W1-Qk,841
-python_liquid-2.3.2.dist-info/METADATA,sha256=FpoUkgvAUbCL5Xg2He4xOmqVvCU1E_xvZpPn8ci9FYw,6786
-python_liquid-2.3.2.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-python_liquid-2.3.2.dist-info/licenses/LICENSE,sha256=yAFURzud5ERNHt1rZIPnTLJ92ep7q8y5yG9g5DUMR_E,1075
-python_liquid-2.3.2.dist-info/RECORD,,
+python_liquid-2.3.3.dist-info/METADATA,sha256=a-KRGeZCSl--UvxyKik-9b25wCnmrH2NmHt41buB618,6786
+python_liquid-2.3.3.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+python_liquid-2.3.3.dist-info/licenses/LICENSE,sha256=yAFURzud5ERNHt1rZIPnTLJ92ep7q8y5yG9g5DUMR_E,1075
+python_liquid-2.3.3.dist-info/RECORD,,