From a0e1647117225b10e3ee96f9a895ecf2fea40eaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= Date: Sun, 2 Jan 2022 15:25:38 +0200 Subject: Upgraded syntax and switched linting over to pre-commit.ci Linting checks are now run by pre-commit.ci instead of GitHub Actions. --- src/apscheduler/schedulers/async_.py | 26 +++++++++++++------------- src/apscheduler/schedulers/sync.py | 24 ++++++++++++------------ 2 files changed, 25 insertions(+), 25 deletions(-) (limited to 'src/apscheduler/schedulers') diff --git a/src/apscheduler/schedulers/async_.py b/src/apscheduler/schedulers/async_.py index 61e2e64..6d3287f 100644 --- a/src/apscheduler/schedulers/async_.py +++ b/src/apscheduler/schedulers/async_.py @@ -6,7 +6,7 @@ import random from contextlib import AsyncExitStack from datetime import datetime, timedelta, timezone from logging import Logger, getLogger -from typing import Any, Callable, Iterable, Mapping, Optional +from typing import Any, Callable, Iterable, Mapping from uuid import UUID, uuid4 import anyio @@ -37,11 +37,11 @@ class AsyncScheduler: data_store: AsyncDataStore = attrs.field(converter=as_async_datastore, factory=MemoryDataStore) identity: str = attrs.field(kw_only=True, default=None) start_worker: bool = attrs.field(kw_only=True, default=True) - logger: Optional[Logger] = attrs.field(kw_only=True, default=getLogger(__name__)) + logger: Logger | None = attrs.field(kw_only=True, default=getLogger(__name__)) _state: RunState = attrs.field(init=False, default=RunState.stopped) _wakeup_event: anyio.Event = attrs.field(init=False) - _worker: Optional[AsyncWorker] = attrs.field(init=False, default=None) + _worker: AsyncWorker | None = attrs.field(init=False, default=None) _events: LocalAsyncEventBroker = attrs.field(init=False, factory=LocalAsyncEventBroker) _exit_stack: AsyncExitStack = attrs.field(init=False) @@ -54,7 +54,7 @@ class AsyncScheduler: return self._events @property - def worker(self) -> Optional[AsyncWorker]: + def worker(self) -> AsyncWorker | None: return self._worker async def __aenter__(self): @@ -102,11 +102,11 @@ class AsyncScheduler: self._wakeup_event.set() async def add_schedule( - self, func_or_task_id: str | Callable, trigger: Trigger, *, id: Optional[str] = None, - args: Optional[Iterable] = None, kwargs: Optional[Mapping[str, Any]] = None, + self, func_or_task_id: str | Callable, trigger: Trigger, *, id: str | None = None, + args: Iterable | None = None, kwargs: Mapping[str, Any] | None = None, coalesce: CoalescePolicy = CoalescePolicy.latest, misfire_grace_time: float | timedelta | None = None, - max_jitter: float | timedelta | None = None, tags: Optional[Iterable[str]] = None, + max_jitter: float | timedelta | None = None, tags: Iterable[str] | None = None, conflict_policy: ConflictPolicy = ConflictPolicy.do_nothing ) -> str: id = id or str(uuid4()) @@ -139,8 +139,8 @@ class AsyncScheduler: await self.data_store.remove_schedules({schedule_id}) async def add_job( - self, func_or_task_id: str | Callable, *, args: Optional[Iterable] = None, - kwargs: Optional[Mapping[str, Any]] = None, tags: Optional[Iterable[str]] = None + self, func_or_task_id: str | Callable, *, args: Iterable | None = None, + kwargs: Mapping[str, Any] | None = None, tags: Iterable[str] | None = None ) -> UUID: """ Add a job to the data store. @@ -192,8 +192,8 @@ class AsyncScheduler: return result async def run_job( - self, func_or_task_id: str | Callable, *, args: Optional[Iterable] = None, - kwargs: Optional[Mapping[str, Any]] = None, tags: Optional[Iterable[str]] = () + self, func_or_task_id: str | Callable, *, args: Iterable | None = None, + kwargs: Mapping[str, Any] | None = None, tags: Iterable[str] | None = () ) -> Any: """ Convenience method to add a job and then return its result (or raise its exception). @@ -207,7 +207,7 @@ class AsyncScheduler: if event.job_id == job_id: job_complete_event.set() - job_id: Optional[UUID] = None + job_id: UUID | None = None with self.data_store.events.subscribe(listener, {JobReleased}): job_id = await self.add_job(func_or_task_id, args=args, kwargs=kwargs, tags=tags) await job_complete_event.wait() @@ -234,7 +234,7 @@ class AsyncScheduler: task_status.started() await self._events.publish(SchedulerStarted()) - exception: Optional[BaseException] = None + exception: BaseException | None = None try: while self._state is RunState.started: schedules = await self.data_store.acquire_schedules(self.identity, 100) diff --git a/src/apscheduler/schedulers/sync.py b/src/apscheduler/schedulers/sync.py index 22270f0..7ead9f8 100644 --- a/src/apscheduler/schedulers/sync.py +++ b/src/apscheduler/schedulers/sync.py @@ -8,7 +8,7 @@ from concurrent.futures import FIRST_COMPLETED, Future, ThreadPoolExecutor, wait from contextlib import ExitStack from datetime import datetime, timedelta, timezone from logging import Logger, getLogger -from typing import Any, Callable, Iterable, Mapping, Optional +from typing import Any, Callable, Iterable, Mapping from uuid import UUID, uuid4 import attrs @@ -36,11 +36,11 @@ class Scheduler: data_store: DataStore = attrs.field(factory=MemoryDataStore) identity: str = attrs.field(kw_only=True, default=None) start_worker: bool = attrs.field(kw_only=True, default=True) - logger: Optional[Logger] = attrs.field(kw_only=True, default=getLogger(__name__)) + logger: Logger | None = attrs.field(kw_only=True, default=getLogger(__name__)) _state: RunState = attrs.field(init=False, default=RunState.stopped) _wakeup_event: threading.Event = attrs.field(init=False) - _worker: Optional[Worker] = attrs.field(init=False, default=None) + _worker: Worker | None = attrs.field(init=False, default=None) _events: LocalEventBroker = attrs.field(init=False, factory=LocalEventBroker) _exit_stack: ExitStack = attrs.field(init=False) @@ -57,7 +57,7 @@ class Scheduler: return self._state @property - def worker(self) -> Optional[Worker]: + def worker(self) -> Worker | None: return self._worker def __enter__(self) -> Scheduler: @@ -112,11 +112,11 @@ class Scheduler: self._wakeup_event.set() def add_schedule( - self, func_or_task_id: str | Callable, trigger: Trigger, *, id: Optional[str] = None, - args: Optional[Iterable] = None, kwargs: Optional[Mapping[str, Any]] = None, + self, func_or_task_id: str | Callable, trigger: Trigger, *, id: str | None = None, + args: Iterable | None = None, kwargs: Mapping[str, Any] | None = None, coalesce: CoalescePolicy = CoalescePolicy.latest, misfire_grace_time: float | timedelta | None = None, - max_jitter: float | timedelta | None = None, tags: Optional[Iterable[str]] = None, + max_jitter: float | timedelta | None = None, tags: Iterable[str] | None = None, conflict_policy: ConflictPolicy = ConflictPolicy.do_nothing ) -> str: id = id or str(uuid4()) @@ -149,8 +149,8 @@ class Scheduler: self.data_store.remove_schedules({schedule_id}) def add_job( - self, func_or_task_id: str | Callable, *, args: Optional[Iterable] = None, - kwargs: Optional[Mapping[str, Any]] = None, tags: Optional[Iterable[str]] = None + self, func_or_task_id: str | Callable, *, args: Iterable | None = None, + kwargs: Mapping[str, Any] | None = None, tags: Iterable[str] | None = None ) -> UUID: """ Add a job to the data store. @@ -202,8 +202,8 @@ class Scheduler: return result def run_job( - self, func_or_task_id: str | Callable, *, args: Optional[Iterable] = None, - kwargs: Optional[Mapping[str, Any]] = None, tags: Optional[Iterable[str]] = () + self, func_or_task_id: str | Callable, *, args: Iterable | None = None, + kwargs: Mapping[str, Any] | None = None, tags: Iterable[str] | None = () ) -> Any: """ Convenience method to add a job and then return its result (or raise its exception). @@ -217,7 +217,7 @@ class Scheduler: if event.job_id == job_id: job_complete_event.set() - job_id: Optional[UUID] = None + job_id: UUID | None = None with self.data_store.events.subscribe(listener, {JobReleased}): job_id = self.add_job(func_or_task_id, args=args, kwargs=kwargs, tags=tags) job_complete_event.wait() -- cgit v1.2.1