diff options
author | Alex Grönholm <alex.gronholm@nextday.fi> | 2021-09-08 11:35:31 +0300 |
---|---|---|
committer | Alex Grönholm <alex.gronholm@nextday.fi> | 2021-09-08 11:39:24 +0300 |
commit | 075fce4105699c7adb4abc5f22de62dfc83b7e2b (patch) | |
tree | 976eebfdd03fbf1d3601c9c774a21624e24a7219 /src | |
parent | c4e9a6676df302a8d783ed540a2d53682af60a7e (diff) | |
download | apscheduler-075fce4105699c7adb4abc5f22de62dfc83b7e2b.tar.gz |
More type annotation updates
Diffstat (limited to 'src')
-rw-r--r-- | src/apscheduler/abc.py | 4 | ||||
-rw-r--r-- | src/apscheduler/datastores/async_/sqlalchemy.py | 4 | ||||
-rw-r--r-- | src/apscheduler/datastores/async_/sync_adapter.py | 4 | ||||
-rw-r--r-- | src/apscheduler/datastores/sync/memory.py | 4 | ||||
-rw-r--r-- | src/apscheduler/datastores/sync/mongodb.py | 6 | ||||
-rw-r--r-- | src/apscheduler/datastores/sync/sqlalchemy.py | 4 | ||||
-rw-r--r-- | src/apscheduler/events.py | 8 | ||||
-rw-r--r-- | src/apscheduler/marshalling.py | 6 | ||||
-rw-r--r-- | src/apscheduler/schedulers/async_.py | 4 | ||||
-rw-r--r-- | src/apscheduler/schedulers/sync.py | 4 | ||||
-rw-r--r-- | src/apscheduler/workers/async_.py | 4 | ||||
-rw-r--r-- | src/apscheduler/workers/sync.py | 4 |
12 files changed, 29 insertions, 27 deletions
diff --git a/src/apscheduler/abc.py b/src/apscheduler/abc.py index 8cf8dc1..97fec87 100644 --- a/src/apscheduler/abc.py +++ b/src/apscheduler/abc.py @@ -3,7 +3,7 @@ from __future__ import annotations from abc import ABCMeta, abstractmethod from base64 import b64decode, b64encode from datetime import datetime -from typing import TYPE_CHECKING, Any, Callable, Iterable, Iterator, Optional, Type +from typing import TYPE_CHECKING, Any, Callable, Iterable, Iterator, Optional from uuid import UUID from .enums import ConflictPolicy @@ -68,7 +68,7 @@ class EventSource(metaclass=ABCMeta): @abstractmethod def subscribe( self, callback: Callable[[events.Event], Any], - event_types: Optional[Iterable[Type[events.Event]]] = None + event_types: Optional[Iterable[type[events.Event]]] = None ) -> events.SubscriptionToken: """ Subscribe to events from this event source. diff --git a/src/apscheduler/datastores/async_/sqlalchemy.py b/src/apscheduler/datastores/async_/sqlalchemy.py index bb07c0b..a897556 100644 --- a/src/apscheduler/datastores/async_/sqlalchemy.py +++ b/src/apscheduler/datastores/async_/sqlalchemy.py @@ -6,7 +6,7 @@ from contextlib import AsyncExitStack, closing from datetime import datetime, timedelta, timezone from json import JSONDecodeError from logging import Logger, getLogger -from typing import Any, Callable, Iterable, Optional, Type +from typing import Any, Callable, Iterable, Optional from uuid import UUID import attr @@ -298,7 +298,7 @@ class SQLAlchemyDataStore(AsyncDataStore): return jobs def subscribe(self, callback: Callable[[Event], Any], - event_types: Optional[Iterable[Type[Event]]] = None) -> SubscriptionToken: + event_types: Optional[Iterable[type[Event]]] = None) -> SubscriptionToken: return self._events.subscribe(callback, event_types) def unsubscribe(self, token: SubscriptionToken) -> None: diff --git a/src/apscheduler/datastores/async_/sync_adapter.py b/src/apscheduler/datastores/async_/sync_adapter.py index 96fbd5c..5e9e3f3 100644 --- a/src/apscheduler/datastores/async_/sync_adapter.py +++ b/src/apscheduler/datastores/async_/sync_adapter.py @@ -2,7 +2,7 @@ from __future__ import annotations from datetime import datetime from functools import partial -from typing import Any, Callable, Iterable, Optional, Type +from typing import Any, Callable, Iterable, Optional from uuid import UUID import attr @@ -79,7 +79,7 @@ class AsyncDataStoreAdapter(AsyncDataStore): return await to_thread.run_sync(self.original.get_job_result, job_id) def subscribe(self, callback: Callable[[Event], Any], - event_types: Optional[Iterable[Type[Event]]] = None) -> SubscriptionToken: + event_types: Optional[Iterable[type[Event]]] = None) -> SubscriptionToken: return self.original.subscribe(partial(self._portal.call, callback), event_types) def unsubscribe(self, token: events.SubscriptionToken) -> None: diff --git a/src/apscheduler/datastores/sync/memory.py b/src/apscheduler/datastores/sync/memory.py index 7bb42d3..17ab70c 100644 --- a/src/apscheduler/datastores/sync/memory.py +++ b/src/apscheduler/datastores/sync/memory.py @@ -4,7 +4,7 @@ from bisect import bisect_left, insort_right from collections import defaultdict from datetime import MAXYEAR, datetime, timedelta, timezone from functools import partial -from typing import Any, Callable, Iterable, Optional, Type +from typing import Any, Callable, Iterable, Optional from uuid import UUID import attr @@ -103,7 +103,7 @@ class MemoryDataStore(DataStore): self._events.__exit__(exc_type, exc_val, exc_tb) def subscribe(self, callback: Callable[[events.Event], Any], - event_types: Optional[Iterable[Type[events.Event]]] = None) -> SubscriptionToken: + event_types: Optional[Iterable[type[events.Event]]] = None) -> SubscriptionToken: return self._events.subscribe(callback, event_types) def unsubscribe(self, token: events.SubscriptionToken) -> None: diff --git a/src/apscheduler/datastores/sync/mongodb.py b/src/apscheduler/datastores/sync/mongodb.py index 7252c0f..1b87929 100644 --- a/src/apscheduler/datastores/sync/mongodb.py +++ b/src/apscheduler/datastores/sync/mongodb.py @@ -4,7 +4,7 @@ from collections import defaultdict from contextlib import ExitStack from datetime import datetime, timezone from logging import Logger, getLogger -from typing import Any, Callable, ClassVar, Iterable, Optional, Tuple, Type +from typing import Any, Callable, ClassVar, Iterable, Optional from uuid import UUID import attr @@ -88,7 +88,7 @@ class MongoDBDataStore(DataStore): self._exit_stack.__exit__(exc_type, exc_val, exc_tb) def subscribe(self, callback: Callable[[events.Event], Any], - event_types: Optional[Iterable[Type[events.Event]]] = None) -> SubscriptionToken: + event_types: Optional[Iterable[type[events.Event]]] = None) -> SubscriptionToken: return self._events.subscribe(callback, event_types) def unsubscribe(self, token: events.SubscriptionToken) -> None: @@ -209,7 +209,7 @@ class MongoDBDataStore(DataStore): return schedules def release_schedules(self, scheduler_id: str, schedules: list[Schedule]) -> None: - updated_schedules: list[Tuple[str, datetime]] = [] + updated_schedules: list[tuple[str, datetime]] = [] finished_schedule_ids: list[str] = [] with self.client.start_session() as s, s.start_transaction(): # Update schedules that have a next fire time diff --git a/src/apscheduler/datastores/sync/sqlalchemy.py b/src/apscheduler/datastores/sync/sqlalchemy.py index 3b2c970..2a170db 100644 --- a/src/apscheduler/datastores/sync/sqlalchemy.py +++ b/src/apscheduler/datastores/sync/sqlalchemy.py @@ -3,7 +3,7 @@ from __future__ import annotations from collections import defaultdict from datetime import datetime, timedelta, timezone from logging import Logger, getLogger -from typing import Any, Callable, Iterable, Optional, Type +from typing import Any, Callable, Iterable, Optional from uuid import UUID import attr @@ -204,7 +204,7 @@ class SQLAlchemyDataStore(DataStore): return jobs def subscribe(self, callback: Callable[[Event], Any], - event_types: Optional[Iterable[Type[Event]]] = None) -> SubscriptionToken: + event_types: Optional[Iterable[type[Event]]] = None) -> SubscriptionToken: return self._events.subscribe(callback, event_types) def unsubscribe(self, token: SubscriptionToken) -> None: diff --git a/src/apscheduler/events.py b/src/apscheduler/events.py index d159102..571aead 100644 --- a/src/apscheduler/events.py +++ b/src/apscheduler/events.py @@ -9,7 +9,7 @@ from functools import partial from inspect import isawaitable from logging import Logger from traceback import format_tb -from typing import Any, Callable, Iterable, NewType, Optional, Type +from typing import Any, Callable, Iterable, NewType, Optional from uuid import UUID import attr @@ -226,7 +226,7 @@ class JobFailed(JobExecutionEvent): @attr.define(eq=False, frozen=True) class Subscription: callback: Callable[[Event], Any] - event_types: Optional[set[Type[Event]]] + event_types: Optional[set[type[Event]]] @attr.define @@ -235,7 +235,7 @@ class _BaseEventHub(abc.EventSource): _subscriptions: dict[SubscriptionToken, Subscription] = attr.field(init=False, factory=dict) def subscribe(self, callback: Callable[[Event], Any], - event_types: Optional[Iterable[Type[Event]]] = None) -> SubscriptionToken: + event_types: Optional[Iterable[type[Event]]] = None) -> SubscriptionToken: types = set(event_types) if event_types else None token = SubscriptionToken(object()) subscription = Subscription(callback, types) @@ -264,7 +264,7 @@ class EventHub(_BaseEventHub): self._executor.shutdown(wait=exc_type is None) def subscribe(self, callback: Callable[[Event], Any], - event_types: Optional[Iterable[Type[Event]]] = None) -> SubscriptionToken: + event_types: Optional[Iterable[type[Event]]] = None) -> SubscriptionToken: if iscoroutinefunction(callback): raise ValueError('Coroutine functions are not supported as callbacks on a synchronous ' 'event source') diff --git a/src/apscheduler/marshalling.py b/src/apscheduler/marshalling.py index 4c5e660..00a9277 100644 --- a/src/apscheduler/marshalling.py +++ b/src/apscheduler/marshalling.py @@ -1,7 +1,9 @@ +from __future__ import annotations + import sys from datetime import date, datetime, tzinfo from functools import partial -from typing import Any, Callable, Tuple, overload +from typing import Any, Callable, overload from .exceptions import DeserializationError, SerializationError @@ -11,7 +13,7 @@ else: from backports.zoneinfo import ZoneInfo -def marshal_object(obj) -> Tuple[str, Any]: +def marshal_object(obj) -> tuple[str, Any]: return f'{obj.__class__.__module__}:{obj.__class__.__qualname__}', obj.__getstate__() diff --git a/src/apscheduler/schedulers/async_.py b/src/apscheduler/schedulers/async_.py index 5ef9de2..335adbf 100644 --- a/src/apscheduler/schedulers/async_.py +++ b/src/apscheduler/schedulers/async_.py @@ -5,7 +5,7 @@ import platform from contextlib import AsyncExitStack from datetime import datetime, timedelta, timezone from logging import Logger, getLogger -from typing import Any, Callable, Iterable, Mapping, Optional, Type +from typing import Any, Callable, Iterable, Mapping, Optional from uuid import uuid4 import anyio @@ -87,7 +87,7 @@ class AsyncScheduler(EventSource): del self._wakeup_event def subscribe(self, callback: Callable[[Event], Any], - event_types: Optional[Iterable[Type[Event]]] = None) -> SubscriptionToken: + event_types: Optional[Iterable[type[Event]]] = None) -> SubscriptionToken: return self._events.subscribe(callback, event_types) def unsubscribe(self, token: SubscriptionToken) -> None: diff --git a/src/apscheduler/schedulers/sync.py b/src/apscheduler/schedulers/sync.py index 487b724..d336276 100644 --- a/src/apscheduler/schedulers/sync.py +++ b/src/apscheduler/schedulers/sync.py @@ -7,7 +7,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, Type +from typing import Any, Callable, Iterable, Mapping, Optional from uuid import uuid4 from ..abc import DataStore, EventSource, Trigger @@ -89,7 +89,7 @@ class Scheduler(EventSource): del self._wakeup_event def subscribe(self, callback: Callable[[Event], Any], - event_types: Optional[Iterable[Type[Event]]] = None) -> SubscriptionToken: + event_types: Optional[Iterable[type[Event]]] = None) -> SubscriptionToken: return self._events.subscribe(callback, event_types) def unsubscribe(self, token: SubscriptionToken) -> None: diff --git a/src/apscheduler/workers/async_.py b/src/apscheduler/workers/async_.py index 2cea795..e9ac7e7 100644 --- a/src/apscheduler/workers/async_.py +++ b/src/apscheduler/workers/async_.py @@ -6,7 +6,7 @@ from contextlib import AsyncExitStack from datetime import datetime, timezone from inspect import isawaitable from logging import Logger, getLogger -from typing import Any, Callable, Iterable, Optional, Type +from typing import Any, Callable, Iterable, Optional from uuid import UUID import anyio @@ -83,7 +83,7 @@ class AsyncWorker(EventSource): del self._wakeup_event def subscribe(self, callback: Callable[[Event], Any], - event_types: Optional[Iterable[Type[Event]]] = None) -> SubscriptionToken: + event_types: Optional[Iterable[type[Event]]] = None) -> SubscriptionToken: return self._events.subscribe(callback, event_types) def unsubscribe(self, token: SubscriptionToken) -> None: diff --git a/src/apscheduler/workers/sync.py b/src/apscheduler/workers/sync.py index efb52af..b7803c7 100644 --- a/src/apscheduler/workers/sync.py +++ b/src/apscheduler/workers/sync.py @@ -7,7 +7,7 @@ from concurrent.futures import FIRST_COMPLETED, Future, ThreadPoolExecutor, wait from contextlib import ExitStack from datetime import datetime, timezone from logging import Logger, getLogger -from typing import Any, Callable, Iterable, Optional, Type +from typing import Any, Callable, Iterable, Optional from uuid import UUID from .. import events @@ -84,7 +84,7 @@ class Worker(EventSource): del self._wakeup_event def subscribe(self, callback: Callable[[events.Event], Any], - event_types: Optional[Iterable[Type[events.Event]]] = None) -> SubscriptionToken: + event_types: Optional[Iterable[type[events.Event]]] = None) -> SubscriptionToken: return self._events.subscribe(callback, event_types) def unsubscribe(self, token: events.SubscriptionToken) -> None: |