made #828 backward compatible for HA < 2026.5

also down-revd ruff target-version to py313

Author: craigbarratt

custom_components/pyscript/jupyter_kernel.py

@@ -610,7 +610,7 @@ async def control_listen(self, reader, writer):
                     await self.housekeep_q.put(["shutdown"])
         except asyncio.CancelledError:
             raise
-        except EOFError, ConnectionResetError:
+        except (EOFError, ConnectionResetError):
             _LOGGER.debug("control_listen got eof")
             await self.housekeep_q.put(["unregister", "control", asyncio.current_task()])
             control_socket.close()
@@ -630,7 +630,7 @@ async def stdin_listen(self, reader, writer):
                 # _LOGGER.debug("stdin_listen received %s", _)
         except asyncio.CancelledError:
             raise
-        except EOFError, ConnectionResetError:
+        except (EOFError, ConnectionResetError):
             _LOGGER.debug("stdin_listen got eof")
             await self.housekeep_q.put(["unregister", "stdin", asyncio.current_task()])
             stdin_socket.close()
@@ -651,7 +651,7 @@ async def shell_listen(self, reader, writer):
         except asyncio.CancelledError:
             shell_socket.close()
             raise
-        except EOFError, ConnectionResetError:
+        except (EOFError, ConnectionResetError):
             _LOGGER.debug("shell_listen got eof")
             await self.housekeep_q.put(["unregister", "shell", asyncio.current_task()])
             shell_socket.close()
@@ -672,7 +672,7 @@ async def heartbeat_listen(self, reader, writer):
                 await heartbeat_socket.send(msg)
         except asyncio.CancelledError:
             raise
-        except EOFError, ConnectionResetError:
+        except (EOFError, ConnectionResetError):
             _LOGGER.debug("heartbeat_listen got eof")
             await self.housekeep_q.put(["unregister", "heartbeat", asyncio.current_task()])
             heartbeat_socket.close()
@@ -693,7 +693,7 @@ async def iopub_listen(self, reader, writer):
                 # _LOGGER.debug("iopub received %s", _)
         except asyncio.CancelledError:
             raise
-        except EOFError, ConnectionResetError:
+        except (EOFError, ConnectionResetError):
             await self.housekeep_q.put(["unregister", "iopub", asyncio.current_task()])
             iopub_socket.close()
             self.iopub_socket.discard(iopub_socket)

custom_components/pyscript/state.py

@@ -9,16 +9,55 @@
 from homeassistant.core import Context, HomeAssistant, State as CoreState
 from homeassistant.helpers.restore_state import DATA_RESTORE_STATE
 from homeassistant.helpers.service import async_get_all_descriptions
-from homeassistant.helpers.template.extensions.math import _SENTINEL as MATH_SENTINEL, MathExtension
-from homeassistant.helpers.template.extensions.type_cast import (
-    _SENTINEL as TYPECAST_SENTINEL,
-    TypeCastExtension,
-)
-from homeassistant.helpers.template.helpers import (
-    _SENTINEL,
-    forgiving_boolean,
-    raise_no_default,
-)
+
+try:
+    # HA >= 2026.5
+    from homeassistant.helpers.template.extensions.math import _SENTINEL as MATH_SENTINEL, MathExtension
+    from homeassistant.helpers.template.extensions.type_cast import (
+        _SENTINEL as TYPECAST_SENTINEL,
+        TypeCastExtension,
+    )
+    from homeassistant.helpers.template.helpers import (
+        _SENTINEL,
+        forgiving_boolean,
+        raise_no_default,
+    )
+except ImportError:
+    # HA < 2026.5
+    from homeassistant.helpers.template import (  # type: ignore[no-redef]
+        _SENTINEL,
+        forgiving_boolean,
+        forgiving_float as _forgiving_float,
+        forgiving_int as _forgiving_int,
+        forgiving_round as _forgiving_round,
+        raise_no_default,
+    )
+
+    TYPECAST_SENTINEL = _SENTINEL
+    MATH_SENTINEL = _SENTINEL
+
+    class TypeCastExtension:  # type: ignore[no-redef]
+        """Shim for older HA versions that export forgiving_* as module-level functions."""
+
+        @staticmethod
+        def forgiving_float(value, default=_SENTINEL):
+            """Shim for forgiving_float."""
+            return _forgiving_float(value, default=default)
+
+        @staticmethod
+        def forgiving_int(value, default=_SENTINEL, base=10):
+            """Shim for forgiving_int."""
+            return _forgiving_int(value, default=default, base=base)
+
+    class MathExtension:  # type: ignore[no-redef]
+        """Shim for older HA versions that export forgiving_round as a module-level function."""
+
+        @staticmethod
+        def forgiving_round(value, precision=0, method="common", default=_SENTINEL):
+            """Shim for forgiving_round."""
+            return _forgiving_round(value, precision=precision, method=method, default=default)
+
+
 from homeassistant.util import dt as dt_util
 
 from .const import LOGGER_PATH
@@ -63,7 +102,7 @@ def as_datetime(self, default: datetime = _SENTINEL) -> datetime:
         """Return the state converted to a datetime, matching the forgiving template behaviour."""
         try:
             return dt_util.parse_datetime(self, raise_on_error=True)
-        except ValueError, TypeError:
+        except (ValueError, TypeError):
             if default is _SENTINEL:
                 raise_no_default("as_datetime", self)
         return default

hacs.json

@@ -3,6 +3,5 @@
     "content_in_root": false,
     "domains": ["automation", "script", "timer"],
     "zip_release": true,
-    "filename": "hass-custom-pyscript.zip",
-    "homeassistant": "2026.5.0"
+    "filename": "hass-custom-pyscript.zip"
 }

pyproject.toml

@@ -6,7 +6,7 @@ line-length = 109
 #asyncio_default_fixture_loop_scope = "function"
 
 [tool.ruff]
-target-version = "py314"
+target-version = "py313"
 line-length = 109
 src = ["custom_components", "tests"]
 include = ["custom_components/**/*.py", "tests/**/*.py"]
@@ -84,4 +84,4 @@ ignore = [
 [dependency-groups]
 dev = [
     "ruff==0.15.12",
-]
+]