diff options
author | Alex Grönholm <alex.gronholm@nextday.fi> | 2021-10-02 13:08:28 +0300 |
---|---|---|
committer | Alex Grönholm <alex.gronholm@nextday.fi> | 2021-10-02 13:08:28 +0300 |
commit | 1647d3d59e958ed5f86ef75382ee8e683ca4b34c (patch) | |
tree | 974044de5feb699527079fa03580f2199c6d267b /src/apscheduler/triggers | |
parent | 410a6667beeea383ae174583193bc8c2a9c21f84 (diff) | |
download | apscheduler-1647d3d59e958ed5f86ef75382ee8e683ca4b34c.tar.gz |
Filled in some missing type annotations
Diffstat (limited to 'src/apscheduler/triggers')
-rw-r--r-- | src/apscheduler/triggers/calendarinterval.py | 8 | ||||
-rw-r--r-- | src/apscheduler/triggers/combining.py | 4 | ||||
-rw-r--r-- | src/apscheduler/triggers/cron/__init__.py | 11 | ||||
-rw-r--r-- | src/apscheduler/triggers/date.py | 8 | ||||
-rw-r--r-- | src/apscheduler/triggers/interval.py | 10 |
5 files changed, 20 insertions, 21 deletions
diff --git a/src/apscheduler/triggers/calendarinterval.py b/src/apscheduler/triggers/calendarinterval.py index c184943..2c380d3 100644 --- a/src/apscheduler/triggers/calendarinterval.py +++ b/src/apscheduler/triggers/calendarinterval.py @@ -1,7 +1,7 @@ from __future__ import annotations from datetime import date, datetime, time, timedelta, tzinfo -from typing import Optional +from typing import Any, Optional import attr @@ -112,7 +112,7 @@ class CalendarIntervalTrigger(Trigger): self._last_fire_date = next_date return next_time - def __getstate__(self): + def __getstate__(self) -> dict[str, Any]: return { 'version': 1, 'interval': [self.years, self.months, self.weeks, self.days], @@ -123,7 +123,7 @@ class CalendarIntervalTrigger(Trigger): 'last_fire_date': marshal_date(self._last_fire_date) } - def __setstate__(self, state): + def __setstate__(self, state: dict[str, Any]) -> None: require_state_version(self, state, 1) self.years, self.months, self.weeks, self.days = state['interval'] self.start_date = unmarshal_date(state['start_date']) @@ -132,7 +132,7 @@ class CalendarIntervalTrigger(Trigger): self._time = time(*state['time'], tzinfo=self.timezone) self._last_fire_date = unmarshal_date(state['last_fire_date']) - def __repr__(self): + def __repr__(self) -> str: fields = [] for field in 'years', 'months', 'weeks', 'days': value = getattr(self, field) diff --git a/src/apscheduler/triggers/combining.py b/src/apscheduler/triggers/combining.py index 94cbcbe..c719073 100644 --- a/src/apscheduler/triggers/combining.py +++ b/src/apscheduler/triggers/combining.py @@ -97,7 +97,7 @@ class AndTrigger(BaseCombiningTrigger): self.threshold = timedelta(seconds=state['threshold']) self.max_iterations = state['max_iterations'] - def __repr__(self): + def __repr__(self) -> str: return f'{self.__class__.__name__}({self.triggers}, ' \ f'threshold={self.threshold.total_seconds()}, max_iterations={self.max_iterations})' @@ -134,5 +134,5 @@ class OrTrigger(BaseCombiningTrigger): require_state_version(self, state, 1) super().__setstate__(state) - def __repr__(self): + def __repr__(self) -> str: return f'{self.__class__.__name__}({self.triggers})' diff --git a/src/apscheduler/triggers/cron/__init__.py b/src/apscheduler/triggers/cron/__init__.py index 2b5e45b..40da147 100644 --- a/src/apscheduler/triggers/cron/__init__.py +++ b/src/apscheduler/triggers/cron/__init__.py @@ -1,7 +1,7 @@ from __future__ import annotations from datetime import datetime, timedelta, tzinfo -from typing import ClassVar, Optional, Sequence +from typing import Any, ClassVar, Optional, Sequence import attr from tzlocal import get_localzone @@ -139,9 +139,8 @@ class CronTrigger(Trigger): dateval = datetime.fromtimestamp(dateval.timestamp() + difference.total_seconds(), self.timezone) return dateval, fieldnum - # return datetime_normalize(dateval + difference), fieldnum - def _set_field_value(self, dateval, fieldnum, new_value): + def _set_field_value(self, dateval: datetime, fieldnum: int, new_value: int) -> datetime: values = {} for i, field in enumerate(self._fields): if field.real: @@ -189,7 +188,7 @@ class CronTrigger(Trigger): self._last_fire_time = next_time return next_time - def __getstate__(self): + def __getstate__(self) -> dict[str, Any]: return { 'version': 1, 'timezone': marshal_timezone(self.timezone), @@ -199,7 +198,7 @@ class CronTrigger(Trigger): 'last_fire_time': marshal_date(self._last_fire_time) } - def __setstate__(self, state): + def __setstate__(self, state: dict[str, Any]) -> None: require_state_version(self, state, 1) self.timezone = unmarshal_timezone(state['timezone']) self.start_time = unmarshal_date(state['start_time']) @@ -207,7 +206,7 @@ class CronTrigger(Trigger): self._last_fire_time = unmarshal_date(state['last_fire_time']) self._set_fields(state['fields']) - def __repr__(self): + def __repr__(self) -> str: fields = [f'{field.name}={str(field)!r}' for field in self._fields] fields.append(f'start_time={self.start_time.isoformat()!r}') if self.end_time: diff --git a/src/apscheduler/triggers/date.py b/src/apscheduler/triggers/date.py index 6d5fc50..db06130 100644 --- a/src/apscheduler/triggers/date.py +++ b/src/apscheduler/triggers/date.py @@ -1,7 +1,7 @@ from __future__ import annotations from datetime import datetime -from typing import Optional +from typing import Any, Optional import attr @@ -28,17 +28,17 @@ class DateTrigger(Trigger): else: return None - def __getstate__(self): + def __getstate__(self) -> dict[str, Any]: return { 'version': 1, 'run_time': marshal_date(self.run_time), 'completed': self._completed } - def __setstate__(self, state): + def __setstate__(self, state: dict[str, Any]) -> None: require_state_version(self, state, 1) self.run_time = unmarshal_date(state['run_time']) self._completed = state['completed'] - def __repr__(self): + def __repr__(self) -> str: return f"{self.__class__.__name__}('{self.run_time}')" diff --git a/src/apscheduler/triggers/interval.py b/src/apscheduler/triggers/interval.py index f9bdf3c..8b3d0bc 100644 --- a/src/apscheduler/triggers/interval.py +++ b/src/apscheduler/triggers/interval.py @@ -1,7 +1,7 @@ from __future__ import annotations from datetime import datetime, timedelta -from typing import Optional +from typing import Any, Optional import attr @@ -38,7 +38,7 @@ class IntervalTrigger(Trigger): microseconds: float = 0 start_time: datetime = attr.field(converter=as_aware_datetime, factory=datetime.now) end_time: Optional[datetime] = attr.field(converter=as_aware_datetime, default=None) - _interval: timedelta = attr.field(init=False, eq=False) + _interval: timedelta = attr.field(init=False, eq=False, repr=False) _last_fire_time: Optional[datetime] = attr.field(init=False, eq=False, default=None) def __attrs_post_init__(self) -> None: @@ -63,7 +63,7 @@ class IntervalTrigger(Trigger): else: return None - def __getstate__(self): + def __getstate__(self) -> dict[str, Any]: return { 'version': 1, 'interval': [self.weeks, self.days, self.hours, self.minutes, self.seconds, @@ -73,7 +73,7 @@ class IntervalTrigger(Trigger): 'last_fire_time': marshal_date(self._last_fire_time) } - def __setstate__(self, state): + def __setstate__(self, state: dict[str, Any]) -> None: require_state_version(self, state, 1) self.weeks, self.days, self.hours, self.minutes, self.seconds, self.microseconds = \ state['interval'] @@ -84,7 +84,7 @@ class IntervalTrigger(Trigger): minutes=self.minutes, seconds=self.seconds, microseconds=self.microseconds) - def __repr__(self): + def __repr__(self) -> str: fields = [] for field in 'weeks', 'days', 'hours', 'minutes', 'seconds', 'microseconds': value = getattr(self, field) |