python-liquid 2.2.1__py3-none-any.whl → 2.2.2__py3-none-any.whl

liquid/__init__.py

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

liquid/builtin/loaders/file_system_loader.py

@@ -29,6 +29,9 @@ class FileSystemLoader(BaseLoader):
         ext: A default file extension. Should include a leading period.
         reject_symlinks: When `True`, reject paths to symlinks that resolve to files
             outside the search path. Defaults to `False`.
+
+    Raise:
+        ValueError if `ext` is not a valid suffix.
     """
 
     def __init__(
@@ -48,6 +51,10 @@ class FileSystemLoader(BaseLoader):
         self.ext = ext
         self.reject_symlinks = reject_symlinks
 
+        # Raise a ValueError early if `ext` is invalid.
+        if ext:
+            Path("x").with_suffix(ext)
+
     def resolve_path(self, template_name: str) -> Path:
         """Return a path to the template identified by _template_name_.
 
@@ -57,6 +64,9 @@ class FileSystemLoader(BaseLoader):
         """
         template_path = Path(template_name)
 
+        if not template_path.name:
+            raise TemplateNotFoundError(template_name)
+
         if self.ext and not template_path.suffix:
             template_path = template_path.with_suffix(self.ext)
 

liquid/builtin/tags/cycle_tag.py

@@ -11,6 +11,7 @@ from typing import TextIO
 from liquid.ast import Node
 from liquid.builtin.expressions import PositionalArgument
 from liquid.builtin.expressions import parse_primitive
+from liquid.exceptions import LiquidSyntaxError
 from liquid.stringify import to_liquid_string
 from liquid.tag import Tag
 from liquid.token import TOKEN_COLON
@@ -124,4 +125,8 @@ class CycleTag(Tag):
             tokens.eat(TOKEN_COLON)
 
         args = PositionalArgument.parse(self.env, tokens)
+
+        if not args:
+            raise LiquidSyntaxError("expected at least one argument", token=token)
+
         return self.node_class(token, group_name, [arg.value for arg in args])

liquid/context.py

@@ -175,7 +175,12 @@ class RenderContext:
         """
         it = iter(path)
         root = next(it)
-        assert isinstance(root, str)
+
+        if not isinstance(root, str):
+            if default == UNDEFINED:
+                hint = f"{root} is undefined"
+                return self.env.undefined(str(root), hint=hint, token=token)
+            return default
 
         try:
             obj = self.scope[root]
@@ -316,7 +321,7 @@ class RenderContext:
         """Return the index of the next item in the cycle."""
         namespace: dict[object, int] = self.tag_namespace["cycles"]
         idx = namespace.setdefault(key, 0)
-        namespace[key] = (idx + 1) % length
+        namespace[key] = (idx + 1) % (length or 1)  # Just in case.
         return idx
 
     def ifchanged(self, val: str) -> bool:

liquid/extra/tags/_with.py

@@ -35,16 +35,20 @@ class WithNode(Node):
         self.block = block
         self.blank = self.block.blank
 
-    def render_to_output(self, context: RenderContext, buffer: TextIO) -> int:
-        namespace = dict(arg.evaluate(context) for arg in self.args)
-
-        with context.extend(namespace):
+    def render_to_output(
+        self,
+        context: RenderContext,
+        buffer: TextIO,
+    ) -> int:
+        with context.extend({a.name: a.value.evaluate(context) for a in self.args}):
             return self.block.render(context, buffer)
 
     async def render_to_output_async(
-        self, context: RenderContext, buffer: TextIO
+        self,
+        context: RenderContext,
+        buffer: TextIO,
     ) -> int:
-        namespace = dict([await arg.evaluate_async(context) for arg in self.args])
+        namespace = {a.name: await a.value.evaluate_async(context) for a in self.args}
         with context.extend(namespace):
             return await self.block.render_async(context, buffer)
 
@@ -54,21 +58,16 @@ class WithNode(Node):
         *,
         include_partials: bool = True,  # noqa: ARG002
     ) -> Iterable[Node]:
-        """Return this node's children."""
         yield self.block
 
     def expressions(self) -> Iterable[Expression]:
-        """Return this node's expressions."""
         yield from (arg.value for arg in self.args)
 
     def block_scope(self) -> Iterable[Identifier]:
-        """Return variables this node adds to the node's block scope."""
         yield from (Identifier(p.name, token=p.token) for p in self.args)
 
 
 class WithTag(Tag):
-    """The extra _with_ tag."""
-
     name = TAG_WITH
     end = TAG_ENDWITH
     node_class = WithNode
@@ -76,8 +75,6 @@ class WithTag(Tag):
     def parse(self, stream: TokenStream) -> Node:
         token = stream.eat(TOKEN_TAG)
         args = KeywordArgument.parse(self.env, stream.into_inner(tag=token))
-
-        # Parse the block
         block = get_parser(self.env).parse_block(stream, (TAG_ENDWITH, TOKEN_EOF))
         stream.expect(TOKEN_TAG, value=TAG_ENDWITH)
         return self.node_class(token, args=args, block=block)

{python_liquid-2.2.1.dist-info → python_liquid-2.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-liquid
-Version: 2.2.1
+Version: 2.2.2
 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.2.1.dist-info → python_liquid-2.2.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
-liquid/__init__.py,sha256=YIN6_DEfW6bv9bhNED8Pnl0Ryt3_uCPt1dvMIuw_Yfk,7696
+liquid/__init__.py,sha256=n813bB2brzEFcknsntiYNf-sveMtXuZ4s29Dd2_1-fw,7696
 liquid/analyze_tags.py,sha256=Uc1nueKLRiIejs2JyQIC7u2pxp9l-5HJAMWlg-Qj1m8,7615
 liquid/ast.py,sha256=4ZqSbuW4mv9IvoIMPk3OICUaOI1vPh8P8uFCrXI_3XA,8140
-liquid/context.py,sha256=gSJI1mj7mdcUfiQ09_XCEj5JxAosCGEX85Uuzl9apeI,21505
+liquid/context.py,sha256=fEuMsj9MVguX3Kzy9_k99TWekOwAToL0RtbGm9yZ71o,21718
 liquid/environment.py,sha256=1X5WsOHcFvKAjljQcG3F-cQ9sfxzaiD-N3jGJOG5yHU,23940
 liquid/exceptions.py,sha256=FOc4KAOijF4WHrBGepvi0ycAYT5hu0rhdpsVb2C-ZHs,8336
 liquid/expression.py,sha256=Ozgajah2R5eg1yWA4ITFGaMFoOLt8GIjkE1NKqbBEzk,1143
@@ -46,7 +46,7 @@ liquid/builtin/loaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 liquid/builtin/loaders/caching_file_system_loader.py,sha256=V4OLa6UGT-RELGiV4eu02TeLL4P_JIE2kMYMrO3qy8U,2158
 liquid/builtin/loaders/choice_loader.py,sha256=FE23RLMOiWmsRGZv9t6QmlG7bgMEUSblnucAv3j0SBM,2816
 liquid/builtin/loaders/dict_loader.py,sha256=8TdMJqaYPLwllmIiEmuZNXqH6UOOsi4HuJ2t5sztOOw,1785
-liquid/builtin/loaders/file_system_loader.py,sha256=6CzmJnktLE9n6y8YYEtUZFa4nDsZ6vsAWIDwCg6_vE0,4528
+liquid/builtin/loaders/file_system_loader.py,sha256=zDX3NPFAKWEftMFCh10gFYfgncAlHkaO7IfpCxOnFSQ,4794
 liquid/builtin/loaders/mixins.py,sha256=4Hj5wWGMOi3LqA9ZJYsUb4LFbG0a5DDb9H975G8nn58,5209
 liquid/builtin/loaders/package_loader.py,sha256=XP7LT3aMClgfBlI8OMyHOERlXTXEWmqFH7HskCnY3cs,3659
 liquid/builtin/tags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -54,7 +54,7 @@ liquid/builtin/tags/assign_tag.py,sha256=VTfkPbF-i0KLqMmaacBItFQHaBTP7ECWR-RvVh9
 liquid/builtin/tags/capture_tag.py,sha256=7bOG7qVwcqRx1eStb96AZKQ9tKLBjmzaYAe27LJTIm4,3037
 liquid/builtin/tags/case_tag.py,sha256=8ZN3pWP6axr-y7XAGIDjOkTDis0KSxpw7m1ITSElOVw,9040
 liquid/builtin/tags/comment_tag.py,sha256=BMvee7nVBim_iDScKWbcUBCxNXzbBvguYfQUG3GM1y8,2250
-liquid/builtin/tags/cycle_tag.py,sha256=tbgnEiwENXIfRAKRsVg18KRsZwaNLOLZeuLy-0Xm5c0,3789
+liquid/builtin/tags/cycle_tag.py,sha256=Vl3DuDBkfpDKk2hxcLM99gFW1-OjWC2APHr23iGXkVE,3943
 liquid/builtin/tags/decrement_tag.py,sha256=WgkwWqjJgzjfEKffTKNw0ao6N0JxniadxGO_n1k8oZE,1660
 liquid/builtin/tags/doc_tag.py,sha256=luc2QI-4N7KF49vWak6dNm5Hs9jwlXTAfUlEsr6ZCNM,2055
 liquid/builtin/tags/echo_tag.py,sha256=VvYth9VuA-A9bsfGUOLlM4QxL_frsgWena3yBrrLKPI,1174
@@ -76,7 +76,7 @@ liquid/extra/filters/babel.py,sha256=K0kvw8r5Xy4NwvX4qv-lym14rZ25gB4fCnHqj-IVagI
 liquid/extra/filters/html.py,sha256=j6ghLorvxlVwAtyfVJlmB1tnroGJb8hD-uxUVALVSEQ,929
 liquid/extra/filters/translate.py,sha256=PDEgvmdOvg45ChAKLsaqtamOqaBWOFh4XzQC8igXIyE,13019
 liquid/extra/tags/__init__.py,sha256=iqB5oOPYhZey-dyljrgAjGeni4lK8Q9-rW2cGRHa4hw,383
-liquid/extra/tags/_with.py,sha256=QLlpY3oW8prCmutEXv1uUCMo_hloLd-sEbiMkMIbtXM,2627
+liquid/extra/tags/_with.py,sha256=gZ3SjoQoSVFFsayMZQJimwwRpHK4c_tsuKU7wZvL0Hk,2432
 liquid/extra/tags/extends_tag.py,sha256=3PL1y1FHaeh6L4rA_Xz6wP6l5oHdiOY_u42ivS6c3xE,17893
 liquid/extra/tags/macro_tag.py,sha256=ErjPxOVB50KKn2qi7-2Icmrbx5Uldv2vUSj49TCs4bY,8749
 liquid/extra/tags/snippet_tag.py,sha256=8tFZWDvwhRId5IV0mNKhkFswJx3eTeAYs7-nAwiorNY,3155
@@ -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.2.1.dist-info/METADATA,sha256=ttOrZWxcSER0sxi5fw52WvjFIqb07SMBFMj18TLp2gk,6745
-python_liquid-2.2.1.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
-python_liquid-2.2.1.dist-info/licenses/LICENSE,sha256=yAFURzud5ERNHt1rZIPnTLJ92ep7q8y5yG9g5DUMR_E,1075
-python_liquid-2.2.1.dist-info/RECORD,,
+python_liquid-2.2.2.dist-info/METADATA,sha256=5GvHUFzsPvOsuLdFLltRz94aEFa3dJ3gxg_21QBLDoc,6745
+python_liquid-2.2.2.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+python_liquid-2.2.2.dist-info/licenses/LICENSE,sha256=yAFURzud5ERNHt1rZIPnTLJ92ep7q8y5yG9g5DUMR_E,1075
+python_liquid-2.2.2.dist-info/RECORD,,