python-liquid 2.3.5__tar.gz → 2.3.7__tar.gz

{python_liquid-2.3.5 → python_liquid-2.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: python-liquid
-Version: 2.3.5
+Version: 2.3.7
 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/
@@ -38,32 +38,9 @@ Python Liquid is a Python engine for <a href="https://shopify.github.io/liquid/"
 <br>
 We follow <a href="https://github.com/Shopify/liquid">Shopify/Liquid</a> closely and test against the <a href="https://github.com/jg-rp/golden-liquid">Golden Liquid</a> test suite.
 </p>
-<p align="center">
-  <a href="https://pypi.org/project/python-liquid/">
-    <img src="https://img.shields.io/pypi/v/python-liquid.svg?style=flat-square" alt="PyPi - Version">
-  </a>
-  <a href="https://anaconda.org/conda-forge/python-liquid">
-    <img src="https://img.shields.io/conda/vn/conda-forge/python-liquid?style=flat-square" alt="conda-forge">
-  </a>
-  <a href="https://pypi.org/project/python-liquid/">
-    <img src="https://img.shields.io/pypi/pyversions/python-liquid.svg?style=flat-square" alt="Python versions">
-  </a>
-  <br>
-  <a href="https://github.com/jg-rp/liquid/actions/workflows/tests.yaml">
-    <img src="https://img.shields.io/github/actions/workflow/status/jg-rp/liquid/tests.yaml?branch=main&label=tests&style=flat-square" alt="Tests">
-  </a>
-  <a href="https://github.com/jg-rp/liquid/actions/workflows/coverage.yaml">
-    <img src="https://img.shields.io/github/actions/workflow/status/jg-rp/liquid/coverage.yaml?branch=main&label=coverage&style=flat-square" alt="Coverage">
-  </a>
-  <br>
-  <a href="https://pypi.org/project/python-liquid/">
-    <img alt="PyPI - Downloads" src="https://img.shields.io/pypi/dm/python-liquid?style=flat-square">
-  </a>
-  <br>
-  <a href="https://github.com/jg-rp/liquid/blob/main/LICENSE">
-    <img src="https://img.shields.io/pypi/l/python-liquid.svg?style=flat-square" alt="License">
-  </a>
-</p>
+
+> [!WARNING]
+> This is the v2 branch of Python Liquid.
 
 ---
 

{python_liquid-2.3.5 → python_liquid-2.3.7}/README.md

@@ -5,32 +5,9 @@ Python Liquid is a Python engine for <a href="https://shopify.github.io/liquid/"
 <br>
 We follow <a href="https://github.com/Shopify/liquid">Shopify/Liquid</a> closely and test against the <a href="https://github.com/jg-rp/golden-liquid">Golden Liquid</a> test suite.
 </p>
-<p align="center">
-  <a href="https://pypi.org/project/python-liquid/">
-    <img src="https://img.shields.io/pypi/v/python-liquid.svg?style=flat-square" alt="PyPi - Version">
-  </a>
-  <a href="https://anaconda.org/conda-forge/python-liquid">
-    <img src="https://img.shields.io/conda/vn/conda-forge/python-liquid?style=flat-square" alt="conda-forge">
-  </a>
-  <a href="https://pypi.org/project/python-liquid/">
-    <img src="https://img.shields.io/pypi/pyversions/python-liquid.svg?style=flat-square" alt="Python versions">
-  </a>
-  <br>
-  <a href="https://github.com/jg-rp/liquid/actions/workflows/tests.yaml">
-    <img src="https://img.shields.io/github/actions/workflow/status/jg-rp/liquid/tests.yaml?branch=main&label=tests&style=flat-square" alt="Tests">
-  </a>
-  <a href="https://github.com/jg-rp/liquid/actions/workflows/coverage.yaml">
-    <img src="https://img.shields.io/github/actions/workflow/status/jg-rp/liquid/coverage.yaml?branch=main&label=coverage&style=flat-square" alt="Coverage">
-  </a>
-  <br>
-  <a href="https://pypi.org/project/python-liquid/">
-    <img alt="PyPI - Downloads" src="https://img.shields.io/pypi/dm/python-liquid?style=flat-square">
-  </a>
-  <br>
-  <a href="https://github.com/jg-rp/liquid/blob/main/LICENSE">
-    <img src="https://img.shields.io/pypi/l/python-liquid.svg?style=flat-square" alt="License">
-  </a>
-</p>
+
+> [!WARNING]
+> This is the v2 branch of Python Liquid.
 
 ---
 

{python_liquid-2.3.5 → python_liquid-2.3.7}/liquid/__init__.py

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

{python_liquid-2.3.5 → python_liquid-2.3.7}/liquid/builtin/expressions/logical.py

@@ -618,6 +618,9 @@ 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)
     ):

{python_liquid-2.3.5 → python_liquid-2.3.7}/liquid/builtin/filters/array.py

@@ -73,7 +73,7 @@ def first(left: Any, *, environment: Environment) -> object:
         return None
 
     if isinstance(left, dict):
-        left = list(islice(left.items(), 1))
+        return next(islice(left.items(), 1), None)  # pyright: ignore[reportUnknownVariableType, reportUnknownArgumentType]
 
     try:
         return getitem(left, 0)
@@ -101,17 +101,18 @@ def last(obj: Sequence[Any], *, environment: Environment) -> object:
 
 
 @sequence_filter
-def concat(sequence: ArrayT, second_array: ArrayT) -> ArrayT:
+def concat(sequence: ArrayT, second_array: object) -> ArrayT:
     """Return the concatenation of _sequence_ and _second_array_."""
     if not isinstance(second_array, (list, tuple)):
         raise FilterArgumentError(
-            f"concat expected an array, found {type(second_array).__name__}"
+            f"concat expected an array, found {type(second_array).__name__}",
+            token=None,
         )
 
     if is_undefined(sequence):
-        return second_array
+        return second_array  # pyright: ignore[reportUnknownVariableType]
 
-    return list(chain(sequence, second_array))
+    return list(chain(sequence, second_array))  # pyright: ignore[reportUnknownArgumentType]
 
 
 @sequence_filter
@@ -166,7 +167,7 @@ def where(sequence: ArrayT, attr: object, value: object = None) -> list[object]:
     if value is not None and not is_undefined(value):
         return [itm for itm in sequence if _getitem(itm, attr) == value]
 
-    return [itm for itm in sequence if _getitem(itm, attr) not in (False, None)]
+    return [itm for itm in sequence if _truthy(_getitem(itm, attr))]
 
 
 @sequence_filter
@@ -178,7 +179,7 @@ def reject(sequence: ArrayT, attr: object, value: object = None) -> list[object]
     if value is not None and not is_undefined(value):
         return [itm for itm in sequence if _getitem(itm, attr) != value]
 
-    return [itm for itm in sequence if _getitem(itm, attr) in (False, None)]
+    return [itm for itm in sequence if not _truthy(_getitem(itm, attr))]
 
 
 @sequence_filter
@@ -187,9 +188,7 @@ def find(sequence: ArrayT, attr: object, value: object = None) -> object:
     if value is not None and not is_undefined(value):
         return next((itm for itm in sequence if _getitem(itm, attr) == value), None)
 
-    return next(
-        (itm for itm in sequence if _getitem(itm, attr) not in (False, None)), None
-    )
+    return next((itm for itm in sequence if _truthy(_getitem(itm, attr))), None)
 
 
 @sequence_filter
@@ -224,30 +223,11 @@ def has(sequence: ArrayT, attr: object, value: object = None) -> bool:
 @sequence_filter
 def uniq(sequence: ArrayT, key: object = None) -> list[object]:
     """Return a copy of _sequence_ with duplicate elements removed."""
-    # Note that we're not using a dict or set for deduplication because we need
-    # to handle sequences containing unhashable objects, like dictionaries.
-
-    # This is probably quite slow.
-    if key is not None:
-        keys = []
-        result = []
-        for obj in sequence:
-            try:
-                item = obj[key]
-            except KeyError:
-                item = MISSING
-            except TypeError as err:
-                raise FilterArgumentError(
-                    f"can't read property '{key}' of {obj}", token=None
-                ) from err
-
-            if item not in keys:
-                keys.append(item)
-                result.append(obj)
+    if _nil(key):
+        return [obj for i, obj in enumerate(sequence) if sequence.index(obj) == i]
 
-        return result
-
-    return [obj for i, obj in enumerate(sequence) if sequence.index(obj) == i]
+    keys = [_getitem(obj, key) for obj in sequence]
+    return [sequence[i] for i, key in enumerate(keys) if keys.index(key) == i]
 
 
 @sequence_filter
@@ -327,3 +307,13 @@ class _Null:
 
 
 _NULL = _Null()
+
+
+def _nil(obj: object) -> bool:
+    # Liquid nullish-ness
+    return obj is None or is_undefined(obj) or obj is _NULL
+
+
+def _truthy(obj: object) -> bool:
+    # Liquid truthiness. 0 is truthy.
+    return obj is not False and obj is not None and not is_undefined(obj)

{python_liquid-2.3.5 → python_liquid-2.3.7}/liquid/builtin/loaders/file_system_loader.py

@@ -6,6 +6,7 @@ import asyncio
 import os
 from functools import partial
 from pathlib import Path
+from pathlib import PurePath
 from typing import TYPE_CHECKING
 from typing import Iterable
 from typing import Optional
@@ -62,7 +63,9 @@ class FileSystemLoader(BaseLoader):
         _template_name_ exists. If none of the search paths contain _template_name_, a
         _TemplateNotFound_ exception is raised.
         """
-        template_path = Path(template_name)
+        template_path = PurePath(template_name)
+        if template_path.anchor:
+            template_path = PurePath(*template_path.parts[1:])
 
         if not template_path.name:
             raise TemplateNotFoundError(template_name)
@@ -74,26 +77,24 @@ class FileSystemLoader(BaseLoader):
             raise TemplateNotFoundError(template_name)
 
         for base in self.search_path:
-            source_path = base.joinpath(template_path)
+            base_resolved = base.resolve()
+            source_path = (base_resolved / template_path).resolve()
 
-            try:
-                if not source_path.exists() or not source_path.is_file():
-                    continue
-            except OSError:
-                # "File name too long", for example
+            if not source_path.is_relative_to(base_resolved):
                 continue
 
             if self.reject_symlinks:
-                try:
-                    resolved = source_path.resolve(strict=False)
-                    base_resolved = base.resolve(strict=False)
-                except OSError:
-                    continue
+                current = base_resolved
+                for part in template_path.parts:
+                    current /= part
+                    if current.is_symlink():
+                        continue
 
-                if not resolved.is_relative_to(base_resolved):
-                    continue
+            if not source_path.is_file() or source_path.is_dir():
+                continue
 
-            return source_path
+            # We don't want to expose a fully qualified path in error messages.
+            return base / template_path
 
         raise TemplateNotFoundError(template_name)
 

{python_liquid-2.3.5 → python_liquid-2.3.7}/liquid/builtin/loaders/mixins.py

@@ -150,12 +150,12 @@ class CachingLoaderMixin(ABC, _CachingLoaderProtocol):
         cache_key = self.cache_key(name, context, kwargs)
         return await self._check_cache_async(
             env,
-            name,
+            cache_key,
             globals,
             partial(
                 super().load_async,  # type: ignore
                 env,
-                cache_key,
+                name,
                 globals=globals,
                 context=context,
                 **kwargs,