Skip to content

Commit 7251a66

Browse files
committed
Rename RecurrenceRule.prepare to _as_rrule
Signed-off-by: Mathias L. Baumann <[email protected]>
1 parent 4e00078 commit 7251a66

File tree

3 files changed

+16
-10
lines changed

3 files changed

+16
-10
lines changed

src/frequenz/client/dispatch/recurrence.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ def to_protobuf(self) -> PBRecurrenceRule:
186186

187187
return pb_rule
188188

189-
def prepare(self, start_time: datetime) -> rrule.rrule:
189+
def _as_rrule(self, start_time: datetime) -> rrule.rrule:
190190
"""Prepare the rrule object.
191191
192192
Args:

src/frequenz/client/dispatch/types.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,9 @@ def next_run_after(self, after: datetime) -> datetime | None:
254254
# No type information for rrule, so we need to cast
255255
return cast(
256256
datetime | None,
257-
self.recurrence.prepare(self.start_time).after(after, inc=True),
257+
self.recurrence._as_rrule( # pylint: disable=protected-access
258+
self.start_time
259+
).after(after, inc=True),
258260
)
259261

260262
def _until(self, now: datetime) -> datetime | None:
@@ -280,9 +282,11 @@ def _until(self, now: datetime) -> datetime | None:
280282
):
281283
return self.start_time + self.duration
282284

283-
latest_past_start: datetime | None = self.recurrence.prepare(
284-
self.start_time
285-
).before(now, inc=True)
285+
latest_past_start: datetime | None = (
286+
self.recurrence._as_rrule( # pylint: disable=protected-access
287+
self.start_time
288+
).before(now, inc=True)
289+
)
286290

287291
if not latest_past_start:
288292
return None

tests/test_dispatch.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,9 @@ def test_dispatch_next_run(
215215

216216
if recurrence.frequency == Frequency.WEEKLY:
217217
# Compute the next run based on the recurrence rule
218-
expected_next_run = recurrence.prepare(start_time).after(
219-
CURRENT_TIME, inc=False
220-
)
218+
expected_next_run = recurrence._as_rrule( # pylint: disable=protected-access
219+
start_time
220+
).after(CURRENT_TIME, inc=False)
221221
elif expected_next_run_offset is not None:
222222
expected_next_run = CURRENT_TIME + expected_next_run_offset
223223
else:
@@ -266,8 +266,10 @@ def test_dispatch_next_run_after(
266266
)
267267

268268
if recurrence.frequency == Frequency.WEEKLY:
269-
expected_next_run_after = recurrence.prepare(dispatch.start_time).after(
270-
after, inc=True
269+
expected_next_run_after = (
270+
recurrence._as_rrule( # pylint: disable=protected-access
271+
dispatch.start_time
272+
).after(after, inc=True)
271273
)
272274
elif expected_next_run_after_offset is not None:
273275
expected_next_run_after = CURRENT_TIME + expected_next_run_after_offset

0 commit comments

Comments
 (0)