Skip to content

fix: TypeError when passing timezone-aware datetime to until() #657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
koteshyelamati wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −2
Open

fix: TypeError when passing timezone-aware datetime to until() #657

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions schedule/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,12 @@ def until(
"until() takes a string, datetime.datetime, datetime.timedelta, "
"datetime.time parameter"
)
if self.cancel_after < datetime.datetime.now():
now = (
datetime.datetime.now(tz=self.cancel_after.tzinfo)
if self.cancel_after.tzinfo is not None
else datetime.datetime.now()
)
if self.cancel_after < now:
raise ScheduleValueError(
"Cannot schedule a job to run until a time in the past"
)
Expand Down Expand Up @@ -817,7 +822,13 @@ def _correct_utc_offset(
return moment

def _is_overdue(self, when: datetime.datetime):
return self.cancel_after is not None and when > self.cancel_after
if self.cancel_after is None:
return False
# When cancel_after is timezone-aware but `when` is naive, localize `when`
# so the comparison does not raise TypeError.
if self.cancel_after.tzinfo is not None and when.tzinfo is None:
when = when.astimezone(self.cancel_after.tzinfo)
return when > self.cancel_after

def _decode_datetimestr(
self, datetime_str: str, formats: List[str]
Expand Down