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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: python-liquid
-Version: 2.3.3
+Version: 2.3.5
 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/
@@ -20,6 +20,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.9

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

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

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

@@ -641,7 +641,7 @@ def _le(left: object, right: object) -> bool:
         right = right.__liquid__()
 
     if isinstance(left, str) and isinstance(right, str):
-        return left < right
+        return left <= right
 
     if isinstance(left, bool) or isinstance(right, bool):
         return False
@@ -649,7 +649,7 @@ def _le(left: object, right: object) -> bool:
     if isinstance(left, (int, float, Decimal)) and isinstance(
         right, (int, float, Decimal)
     ):
-        return left < right
+        return left <= right
 
     if left is None or right is None:
         return False

{python_liquid-2.3.3 → python_liquid-2.3.5}/liquid/builtin/filters/misc.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-import datetime
+import datetime as dt
 import decimal
 import functools
 from typing import TYPE_CHECKING
@@ -62,9 +62,8 @@ def default(obj: Any, default_: object = "", *, allow_false: bool = False) -> An
 
 @with_environment
 @liquid_filter
-@functools.lru_cache(maxsize=10)
-def date(  # noqa: PLR0912 PLR0911
-    dat: Union[datetime.datetime, str, int],
+def date(
+    dat: Union[dt.datetime, str, int],
     fmt: str,
     *,
     environment: Environment,
@@ -76,44 +75,63 @@ def date(  # noqa: PLR0912 PLR0911
     if is_undefined(fmt):
         return str(dat)
 
-    if isinstance(dat, str):
-        if dat in ("now", "today"):
-            dat = datetime.datetime.now()
-        elif dat.isdigit():
-            # The reference implementation does not support string
-            # representations of negative integers either.
-            dat = datetime.datetime.fromtimestamp(int(dat))
-        else:
-            try:
-                dat = parser.parse(dat)
-            except parser.ParserError:
-                # Input is returned unchanged. This is consistent
-                # with the reference implementation.
-                return str(dat)
-    elif isinstance(dat, int):
-        try:
-            dat = datetime.datetime.fromtimestamp(dat)
-        except (OverflowError, OSError):
-            # Testing on Windows shows that it can't handle some
-            # negative integers.
-            return str(dat)
+    date_ = dt.datetime.now() if dat in ("now", "today") else _to_date(dat)
 
-    if not isinstance(dat, (datetime.datetime, datetime.date)):
+    if date_ is None:
+        if isinstance(dat, (str, int)):
+            # Input is returned unchanged. This is consistent
+            # with the reference implementation.
+            return str(dat)
         raise FilterArgumentError(
-            f"date expected datetime.datetime, found {type(dat).__name__}"
+            f"date expected datetime.datetime, found {type(dat).__name__}",
+            token=None,
         )
 
     try:
-        rv = dat.strftime(fmt)
+        rv = date_.strftime(fmt)
     except ValueError as err:
         # This is not uncommon on Windows when a format string contains
         # directives that are not officially supported by Python.
 
         # Handle "%s" as a special case.
         if fmt == r"%s":
-            return str(dat.timestamp()).split(".")[0]
+            return str(date_.timestamp()).split(".")[0]
         raise FilterArgumentError(str(err), token=None) from err
 
     if environment.autoescape and isinstance(fmt, Markup):
         return Markup(rv)
     return rv
+
+
+@functools.lru_cache(maxsize=10)
+def _to_date(  # noqa: PLR0911
+    d: object,
+) -> Union[dt.datetime, None]:
+    if isinstance(d, dt.datetime):
+        return d
+
+    if isinstance(d, dt.date):
+        return dt.datetime.combine(d, dt.time.min)
+
+    if isinstance(d, str):
+        if d.isdigit():
+            # The reference implementation does not support string
+            # representations of negative integers either.
+            return dt.datetime.fromtimestamp(int(d))
+
+        try:
+            return parser.parse(d)
+        except parser.ParserError:
+            # Input is returned unchanged. This is consistent
+            # with the reference implementation.
+            return None
+
+    if isinstance(d, int):
+        try:
+            return dt.datetime.fromtimestamp(d)
+        except (OverflowError, OSError):
+            # Testing on Windows shows that it can't handle some
+            # negative integers.
+            return None
+
+    return None

{python_liquid-2.3.3 → python_liquid-2.3.5}/liquid/utils/lru_cache.py

@@ -126,4 +126,4 @@ class ThreadSafeLRUCache(LRUCache[_KT, _VT]):
     def items(self) -> Iterator[tuple[_KT, _VT]]:
         """Return an iterator over this cache's key/value pairs."""
         with self._lock:
-            return super().items()
+            return super().items()

{python_liquid-2.3.3 → python_liquid-2.3.5}/pyproject.toml

@@ -17,6 +17,7 @@ classifiers = [
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
   "Programming Language :: Python :: 3.14",
+  "Programming Language :: Python :: 3.15",
 ]
 dependencies = [
   "MarkupSafe>=3",
@@ -81,7 +82,7 @@ test = "pytest {args}"
 typing = "mypy"
 
 [[tool.hatch.envs.test.matrix]]
-python = ["39", "310", "311", "312", "313", "314", "pypy39"]
+python = ["39", "310", "311", "312", "313", "314", "315", "pypy39"]
 
 [tool.hatch.envs.test.scripts]
 test = "pytest {args}"
@@ -226,6 +227,7 @@ ignore = [
   "TC006",
   "PLW1641",
   "PLR0917",
+  "ICN001",
 ]
 
 fixable = ["I", "SIM", "D202"]