pruning

Author: jsl12

appdaemon/utils.py

@@ -377,17 +377,6 @@ def format_timedelta(td: str | int | float | timedelta | None) -> str:
                 return res
 
 
-def parse_offset(input_: str) -> timedelta:
-    if m := re.search(r"\s+(?P<sign>[+-])\s+", input_):
-        offset = parse_timedelta(input_[m.span()[1]:])
-        match m.group("sign"):
-            case "-":
-                offset *= -1
-            case "+":
-                pass
-    return offset
-
-
 def now_is_between(
     now: datetime,
     start_time: str | time | datetime,

tests/unit/datetime/test_parse_datetime.py

@@ -2,13 +2,14 @@
 from functools import partial
 from typing import Literal
 
-import appdaemon.parse
 import pytest
-from appdaemon import utils
 from astral import SunDirection
 from astral.location import Location
 from pytz import BaseTzInfo
 
+import appdaemon.parse
+from appdaemon.parse import resolve_time_str
+
 from .utils import ParameterBuilder
 
 pytestmark = [
@@ -73,7 +74,7 @@ def test_parse_sun_offsets(
         assert result.tzinfo is not None
 
         type_ = input_.split()[0]
-        offset = utils.parse_offset(input_)
+        _, offset = resolve_time_str(input_, now=now, location=location)
 
         match now_str, when, type_:
             case (_, "today", "sunrise"):