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

liquid/__init__.py

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

liquid/builtin/expressions/loop.py

@@ -13,6 +13,7 @@ from typing import Union
 from liquid import Mode
 from liquid.exceptions import LiquidSyntaxError
 from liquid.exceptions import LiquidTypeError
+from liquid.exceptions import LiquidValueError
 from liquid.expression import Expression
 from liquid.limits import to_int
 from liquid.token import TOKEN_ASSIGN
@@ -95,7 +96,12 @@ class LoopExpression(Expression):
         if isinstance(obj, Mapping):
             return iter(obj.items()), len(obj)
         if isinstance(obj, range):
-            return iter(obj), len(obj)
+            try:
+                return iter(obj), len(obj)
+            except OverflowError as err:
+                raise LiquidValueError(
+                    "range literal length limit reached", token=None
+                ) from err
         if isinstance(obj, str) and not context.env.string_sequences:
             return (iter([]), 0) if not obj else (iter([obj]), 1)
         if isinstance(obj, Sequence):

liquid/builtin/expressions/primitive.py

@@ -39,12 +39,6 @@ if TYPE_CHECKING:
     from liquid import TokenStream
 
 
-# MAX_RANGE = (2**53) - 1
-# MIN_RANGE = -(2**53) + 1
-MAX_RANGE = 1024
-MIN_RANGE = -1024
-
-
 class Nil(Expression):
     __slots__ = ()
 
@@ -255,9 +249,7 @@ class RangeLiteral(Expression):
         if start > stop:
             return range(0)
 
-        return range(
-            clamp(start, MIN_RANGE, MAX_RANGE), clamp(stop + 1, MIN_RANGE, MAX_RANGE)
-        )
+        return range(start, stop + 1)
 
     def evaluate(self, context: RenderContext) -> range:
         return self._make_range(
@@ -423,8 +415,3 @@ def parse_string_or_path(
 def is_empty(obj: object) -> bool:
     """Return True if _obj_ is considered empty."""
     return isinstance(obj, (list, dict, str)) and not obj
-
-
-def clamp(n: int, min_value: int, max_value: int) -> int:
-    """Clamp _n_ between _min_value_ and _max_value_."""
-    return max(min_value, min(n, max_value))

liquid/builtin/filters/array.py

@@ -59,13 +59,17 @@ def join(
     return separator.join(_str_if_not(item) for item in left)
 
 
+@with_environment
 @liquid_filter
-def first(left: Any) -> object:
+def first(left: Any, *, environment: Environment) -> object:
     """Return the first item in collection _left_.
 
     If _left_ is not a collection or it is empty, `None` is returned.
     """
     if isinstance(left, str):
+        # Honor the opt-in Ruby-compat flag, matching the `.first` property path.
+        if environment.string_first_and_last:
+            return left[0] if left else None
         return None
 
     if isinstance(left, dict):
@@ -77,13 +81,17 @@ def first(left: Any) -> object:
         return None
 
 
+@with_environment
 @liquid_filter
-def last(obj: Sequence[Any]) -> object:
+def last(obj: Sequence[Any], *, environment: Environment) -> object:
     """Return the last item in collection _left_.
 
     If _left_ is not a collection or it is empty, `None` is returned.
     """
     if isinstance(obj, str):
+        # Honor the opt-in Ruby-compat flag, matching the `.last` property path.
+        if environment.string_first_and_last:
+            return obj[-1] if obj else None
         return None
 
     try:

liquid/builtin/loaders/package_loader.py

@@ -4,19 +4,19 @@ from __future__ import annotations
 
 import asyncio
 import os
-from importlib.resources import files
 from pathlib import Path
 from typing import TYPE_CHECKING
 from typing import Iterable
 from typing import Optional
 from typing import Union
 
+import importlib_resources
+
 from liquid.exceptions import TemplateNotFoundError
 from liquid.loader import BaseLoader
 from liquid.loader import TemplateSource
 
 if TYPE_CHECKING:
-    from importlib.abc import Traversable
     from types import ModuleType
 
     from liquid import Environment
@@ -44,31 +44,45 @@ class PackageLoader(BaseLoader):
         ext: str = ".liquid",
     ) -> None:
         if isinstance(package_path, str):
-            self.paths = [files(package).joinpath(package_path)]
+            self.paths = [importlib_resources.files(package).joinpath(package_path)]
         else:
-            _package = files(package)
+            _package = importlib_resources.files(package)
             self.paths = [_package.joinpath(path) for path in package_path]
 
         self.encoding = encoding
         self.ext = ext
 
-    def _resolve_path(self, template_name: str) -> Traversable:
+    def _resolve_path(self, template_name: str) -> Path:
         template_path = Path(template_name)
 
-        # Don't build a path that escapes package/package_path.
-        # Does ".." appear in template_name?
-        if os.path.pardir in template_path.parts:
+        if not template_path.name:
             raise TemplateNotFoundError(template_name)
 
         # Add suffix self.ext if template name does not have a suffix.
         if not template_path.suffix:
             template_path = template_path.with_suffix(self.ext)
 
+        if os.path.pardir in template_path.parts or template_path.is_absolute():
+            raise TemplateNotFoundError(template_name)
+
         for path in self.paths:
-            source_path = path.joinpath(str(template_path))
-            if source_path.is_file():
-                # MyPy seems to think source_path has `Any` type :(
-                return source_path  # type: ignore
+            with importlib_resources.as_file(path) as base:
+                source_path: Path = base.joinpath(template_path)
+
+                try:
+                    if not source_path.exists() or not source_path.is_file():
+                        continue
+                except OSError:
+                    # "File name too long", for example
+                    continue
+
+                resolved = source_path.resolve(strict=False)
+                base_resolved = base.resolve(strict=False)
+
+                if not resolved.is_relative_to(base_resolved):
+                    continue
+
+                return source_path
 
         raise TemplateNotFoundError(template_name)
 

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: python-liquid
-Version: 2.3.0
+Version: 2.3.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/
@@ -24,6 +24,7 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.9
 Requires-Dist: babel>=2
+Requires-Dist: importlib-resources>=5.12
 Requires-Dist: markupsafe>=3
 Requires-Dist: python-dateutil>=2.8.1
 Requires-Dist: pytz

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

@@ -1,4 +1,4 @@
-liquid/__init__.py,sha256=AAejVPvOWNpGawkdw3_4krnVAmu4SWjcJzbi0N5lhyw,7696
+liquid/__init__.py,sha256=qJCQnUp4SFeIjlrsTo6I07bqqVUFptfOj9xbwHXb3nQ,7696
 liquid/analyze_tags.py,sha256=Uc1nueKLRiIejs2JyQIC7u2pxp9l-5HJAMWlg-Qj1m8,7615
 liquid/ast.py,sha256=4ZqSbuW4mv9IvoIMPk3OICUaOI1vPh8P8uFCrXI_3XA,8140
 liquid/context.py,sha256=fEuMsj9MVguX3Kzy9_k99TWekOwAToL0RtbGm9yZ71o,21718
@@ -33,11 +33,11 @@ liquid/builtin/expressions/_tokenize.py,sha256=p7RbeOg8iwXDnW0fIL4_7FSrBulkPYrCm
 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/loop.py,sha256=ki3kMBuDyT21NZ_VrK19avsGbwBfz0VrrJo-mFox57Q,8594
+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=AlG828WqP3bZuwQTBJTx6RP2FvBra_aoEsq_J4uR4Tk,11684
+liquid/builtin/expressions/primitive.py,sha256=Gzaeb-dF84zsMn5ZYhe-FOosnSbkkM2C6JLqjLvK5ns,11352
 liquid/builtin/filters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-liquid/builtin/filters/array.py,sha256=dMuT15EASXU4ejmNBmawdi92u0f7y_JhqVaGoP48zlg,9843
+liquid/builtin/filters/array.py,sha256=jy35hoouAWI1yG2JX5OMG39Az2dmP--4IcuwqT59JMY,10281
 liquid/builtin/filters/extra.py,sha256=m13_1nbZyRBl3CZV9WWGLlUZueRPt8cKPEHRAioqM_o,2710
 liquid/builtin/filters/math.py,sha256=A_K2wg5gxm5Ncj9zMGDX_Lt7jjx4bRr3CywbCiCtqxo,3925
 liquid/builtin/filters/misc.py,sha256=t2ZsaDLKRc1-8XxZaiEOh7oAMqFJ4N5-tzfbpLHbmIQ,3466
@@ -48,7 +48,7 @@ liquid/builtin/loaders/choice_loader.py,sha256=FE23RLMOiWmsRGZv9t6QmlG7bgMEUSbln
 liquid/builtin/loaders/dict_loader.py,sha256=8TdMJqaYPLwllmIiEmuZNXqH6UOOsi4HuJ2t5sztOOw,1785
 liquid/builtin/loaders/file_system_loader.py,sha256=kKPUmznPgNFq3fRDeoOTbWjNwxuLrYPAteZ_Do1-Mks,4924
 liquid/builtin/loaders/mixins.py,sha256=4Hj5wWGMOi3LqA9ZJYsUb4LFbG0a5DDb9H975G8nn58,5209
-liquid/builtin/loaders/package_loader.py,sha256=XP7LT3aMClgfBlI8OMyHOERlXTXEWmqFH7HskCnY3cs,3659
+liquid/builtin/loaders/package_loader.py,sha256=PNg-ygoRjfiALFu3bzEDRdps30rtsTIkt0voJKs9zCo,4061
 liquid/builtin/tags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 liquid/builtin/tags/assign_tag.py,sha256=VTfkPbF-i0KLqMmaacBItFQHaBTP7ECWR-RvVh9Q6lY,2374
 liquid/builtin/tags/capture_tag.py,sha256=7bOG7qVwcqRx1eStb96AZKQ9tKLBjmzaYAe27LJTIm4,3037
@@ -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.0.dist-info/METADATA,sha256=OALhkJp1Zn90MKHRGuDDMzV9bOb1kbKN38q-2sqFMmY,6745
-python_liquid-2.3.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-python_liquid-2.3.0.dist-info/licenses/LICENSE,sha256=yAFURzud5ERNHt1rZIPnTLJ92ep7q8y5yG9g5DUMR_E,1075
-python_liquid-2.3.0.dist-info/RECORD,,
+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.0.dist-info → python_liquid-2.3.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.29.0
+Generator: hatchling 1.32.4
 Root-Is-Purelib: true
 Tag: py3-none-any