Made the apscheduler.enums and apscheduler.exceptions modules private and re-exported their code

20 files changed, 78 insertions, 38 deletions

diff --git a/src/apscheduler/__init__.py b/src/apscheduler/__init__.py
index e69de29..e2ad001 100644
--- a/src/apscheduler/__init__.py
+++ b/src/apscheduler/__init__.py
@@ -0,0 +1,40 @@
+from __future__ import annotations
+
+__all__ = [
+    "CoalescePolicy",
+    "ConflictPolicy",
+    "ConflictingIdError",
+    "DeserializationError",
+    "JobCancelled",
+    "JobDeadlineMissed",
+    "JobLookupError",
+    "JobOutcome",
+    "JobResultNotReady",
+    "MaxIterationsReached",
+    "RunState",
+    "ScheduleLookupError",
+    "SerializationError",
+    "TaskLookupError",
+]
+
+from typing import Any
+
+from ._enums import CoalescePolicy, ConflictPolicy, JobOutcome, RunState
+from ._exceptions import (
+    ConflictingIdError,
+    DeserializationError,
+    JobCancelled,
+    JobDeadlineMissed,
+    JobLookupError,
+    JobResultNotReady,
+    MaxIterationsReached,
+    ScheduleLookupError,
+    SerializationError,
+    TaskLookupError,
+)
+
+# Re-export imports, so they look like they live directly in this package
+value: Any
+for value in list(locals().values()):
+    if getattr(value, "__module__", "").startswith("apscheduler."):
+        value.__module__ = __name__
diff --git a/src/apscheduler/enums.py b/src/apscheduler/_enums.py
index dec6669..dec6669 100644
--- a/src/apscheduler/enums.py
+++ b/src/apscheduler/_enums.py
diff --git a/src/apscheduler/exceptions.py b/src/apscheduler/_exceptions.py
index 4e680e6..4e680e6 100644
--- a/src/apscheduler/exceptions.py
+++ b/src/apscheduler/_exceptions.py
diff --git a/src/apscheduler/_validators.py b/src/apscheduler/_validators.py
index 995dce7..69df656 100644
--- a/src/apscheduler/_validators.py
+++ b/src/apscheduler/_validators.py
@@ -8,8 +8,8 @@ import attrs
 from attrs import Attribute
 from tzlocal import get_localzone
 
+from ._exceptions import DeserializationError
 from .abc import Trigger
-from .exceptions import DeserializationError
 
 if sys.version_info >= (3, 9):
     from zoneinfo import ZoneInfo
diff --git a/src/apscheduler/abc.py b/src/apscheduler/abc.py
index c270bc6..dad6e47 100644
--- a/src/apscheduler/abc.py
+++ b/src/apscheduler/abc.py
@@ -6,7 +6,7 @@ from datetime import datetime
 from typing import TYPE_CHECKING, Any, Callable, Iterable, Iterator
 from uuid import UUID
 
-from .enums import ConflictPolicy
+from ._enums import ConflictPolicy
 from .structures import Job, JobResult, Schedule, Task
 
 if TYPE_CHECKING:
diff --git a/src/apscheduler/datastores/async_adapter.py b/src/apscheduler/datastores/async_adapter.py
index 6ae51b9..e155116 100644
--- a/src/apscheduler/datastores/async_adapter.py
+++ b/src/apscheduler/datastores/async_adapter.py
@@ -9,8 +9,8 @@ import attrs
 from anyio import to_thread
 from anyio.from_thread import BlockingPortal
 
+from .._enums import ConflictPolicy
 from ..abc import AsyncEventBroker, DataStore
-from ..enums import ConflictPolicy
 from ..eventbrokers.async_adapter import AsyncEventBrokerAdapter, SyncEventBrokerAdapter
 from ..structures import Job, JobResult, Schedule, Task
 from .base import BaseAsyncDataStore
diff --git a/src/apscheduler/datastores/async_sqlalchemy.py b/src/apscheduler/datastores/async_sqlalchemy.py
index 6724250..2f2f37e 100644
--- a/src/apscheduler/datastores/async_sqlalchemy.py
+++ b/src/apscheduler/datastores/async_sqlalchemy.py
@@ -17,8 +17,9 @@ from sqlalchemy.ext.asyncio.engine import AsyncEngine
 from sqlalchemy.sql.ddl import DropTable
 from sqlalchemy.sql.elements import BindParameter
 
+from .._enums import ConflictPolicy
+from .._exceptions import ConflictingIdError, SerializationError, TaskLookupError
 from ..abc import AsyncEventBroker, Job, Schedule
-from ..enums import ConflictPolicy
 from ..events import (
     DataStoreEvent,
     JobAcquired,
@@ -32,7 +33,6 @@ from ..events import (
     TaskRemoved,
     TaskUpdated,
 )
-from ..exceptions import ConflictingIdError, SerializationError, TaskLookupError
 from ..marshalling import callable_to_ref
 from ..structures import JobResult, Task
 from .base import BaseAsyncDataStore
diff --git a/src/apscheduler/datastores/memory.py b/src/apscheduler/datastores/memory.py
index 516d141..d131327 100644
--- a/src/apscheduler/datastores/memory.py
+++ b/src/apscheduler/datastores/memory.py
@@ -9,8 +9,9 @@ from uuid import UUID
 
 import attrs
 
+from .._enums import ConflictPolicy
+from .._exceptions import ConflictingIdError, TaskLookupError
 from ..abc import Job, Schedule
-from ..enums import ConflictPolicy
 from ..events import (
     JobAcquired,
     JobAdded,
@@ -22,7 +23,6 @@ from ..events import (
     TaskRemoved,
     TaskUpdated,
 )
-from ..exceptions import ConflictingIdError, TaskLookupError
 from ..structures import JobResult, Task
 from .base import BaseDataStore
 
diff --git a/src/apscheduler/datastores/mongodb.py b/src/apscheduler/datastores/mongodb.py
index 59a345a..5f0b5ef 100644
--- a/src/apscheduler/datastores/mongodb.py
+++ b/src/apscheduler/datastores/mongodb.py
@@ -17,8 +17,14 @@ from pymongo import ASCENDING, DeleteOne, MongoClient, UpdateOne
 from pymongo.collection import Collection
 from pymongo.errors import ConnectionFailure, DuplicateKeyError
 
+from .._enums import CoalescePolicy, ConflictPolicy, JobOutcome
+from .._exceptions import (
+    ConflictingIdError,
+    DeserializationError,
+    SerializationError,
+    TaskLookupError,
+)
 from ..abc import EventBroker, Job, Schedule, Serializer
-from ..enums import CoalescePolicy, ConflictPolicy, JobOutcome
 from ..eventbrokers.local import LocalEventBroker
 from ..events import (
     DataStoreEvent,
@@ -32,12 +38,6 @@ from ..events import (
     TaskRemoved,
     TaskUpdated,
 )
-from ..exceptions import (
-    ConflictingIdError,
-    DeserializationError,
-    SerializationError,
-    TaskLookupError,
-)
 from ..serializers.pickle import PickleSerializer
 from ..structures import JobResult, RetrySettings, Task
 from .base import BaseDataStore
diff --git a/src/apscheduler/datastores/sqlalchemy.py b/src/apscheduler/datastores/sqlalchemy.py
index c427f9c..c920d52 100644
--- a/src/apscheduler/datastores/sqlalchemy.py
+++ b/src/apscheduler/datastores/sqlalchemy.py
@@ -31,8 +31,9 @@ from sqlalchemy.future import Engine, create_engine
 from sqlalchemy.sql.ddl import DropTable
 from sqlalchemy.sql.elements import BindParameter, literal
 
+from .._enums import CoalescePolicy, ConflictPolicy, JobOutcome
+from .._exceptions import ConflictingIdError, SerializationError, TaskLookupError
 from ..abc import EventBroker, Job, Schedule, Serializer
-from ..enums import CoalescePolicy, ConflictPolicy, JobOutcome
 from ..events import (
     Event,
     JobAcquired,
@@ -47,7 +48,6 @@ from ..events import (
     TaskRemoved,
     TaskUpdated,
 )
-from ..exceptions import ConflictingIdError, SerializationError, TaskLookupError
 from ..marshalling import callable_to_ref
 from ..serializers.pickle import PickleSerializer
 from ..structures import JobResult, RetrySettings, Task
diff --git a/src/apscheduler/eventbrokers/asyncpg.py b/src/apscheduler/eventbrokers/asyncpg.py
index ac29db8..33aa618 100644
--- a/src/apscheduler/eventbrokers/asyncpg.py
+++ b/src/apscheduler/eventbrokers/asyncpg.py
@@ -8,9 +8,9 @@ from anyio import TASK_STATUS_IGNORED, CancelScope, sleep
 from asyncpg import Connection
 from asyncpg.pool import Pool
 
+from .._exceptions import SerializationError
 from ..abc import Serializer
 from ..events import Event
-from ..exceptions import SerializationError
 from ..serializers.json import JSONSerializer
 from .async_local import LocalAsyncEventBroker
 from .base import DistributedEventBrokerMixin
diff --git a/src/apscheduler/eventbrokers/base.py b/src/apscheduler/eventbrokers/base.py
index 5f2ece1..ea30c10 100644
--- a/src/apscheduler/eventbrokers/base.py
+++ b/src/apscheduler/eventbrokers/base.py
@@ -7,9 +7,9 @@ from typing import Any, Callable, Iterable
 import attrs
 
 from .. import events
+from .._exceptions import DeserializationError
 from ..abc import EventSource, Serializer, Subscription
 from ..events import Event
-from ..exceptions import DeserializationError
 
 
 @attrs.define(eq=False, frozen=True)
diff --git a/src/apscheduler/events.py b/src/apscheduler/events.py
index 24697fd..6952043 100644
--- a/src/apscheduler/events.py
+++ b/src/apscheduler/events.py
@@ -10,7 +10,7 @@ from attrs.converters import optional
 
 from . import abc
 from ._converters import as_aware_datetime, as_uuid
-from .enums import JobOutcome
+from ._enums import JobOutcome
 
 
 def serialize(inst, field, value):
diff --git a/src/apscheduler/marshalling.py b/src/apscheduler/marshalling.py
index 63d4994..0398fa7 100644
--- a/src/apscheduler/marshalling.py
+++ b/src/apscheduler/marshalling.py
@@ -5,7 +5,7 @@ from datetime import date, datetime, tzinfo
 from functools import partial
 from typing import Any, Callable, overload
 
-from .exceptions import DeserializationError, SerializationError
+from ._exceptions import DeserializationError, SerializationError
 
 if sys.version_info >= (3, 9):
     from zoneinfo import ZoneInfo
diff --git a/src/apscheduler/schedulers/async_.py b/src/apscheduler/schedulers/async_.py
index 3e0f96a..ca8ab37 100644
--- a/src/apscheduler/schedulers/async_.py
+++ b/src/apscheduler/schedulers/async_.py
@@ -15,10 +15,16 @@ from anyio import TASK_STATUS_IGNORED, create_task_group, move_on_after
 from anyio.abc import TaskGroup, TaskStatus
 
 from .._converters import as_async_datastore, as_async_eventbroker
+from .._enums import CoalescePolicy, ConflictPolicy, JobOutcome, RunState
+from .._exceptions import (
+    JobCancelled,
+    JobDeadlineMissed,
+    JobLookupError,
+    ScheduleLookupError,
+)
 from ..abc import AsyncDataStore, AsyncEventBroker, Job, Schedule, Subscription, Trigger
 from ..context import current_scheduler
 from ..datastores.memory import MemoryDataStore
-from ..enums import CoalescePolicy, ConflictPolicy, JobOutcome, RunState
 from ..eventbrokers.async_local import LocalAsyncEventBroker
 from ..events import (
     Event,
@@ -28,12 +34,6 @@ from ..events import (
     SchedulerStopped,
     ScheduleUpdated,
 )
-from ..exceptions import (
-    JobCancelled,
-    JobDeadlineMissed,
-    JobLookupError,
-    ScheduleLookupError,
-)
 from ..marshalling import callable_to_ref
 from ..structures import JobResult, Task
 from ..workers.async_ import AsyncWorker
diff --git a/src/apscheduler/schedulers/sync.py b/src/apscheduler/schedulers/sync.py
index 356608e..c3e9207 100644
--- a/src/apscheduler/schedulers/sync.py
+++ b/src/apscheduler/schedulers/sync.py
@@ -15,10 +15,16 @@ from uuid import UUID, uuid4
 
 import attrs
 
+from .._enums import CoalescePolicy, ConflictPolicy, JobOutcome, RunState
+from .._exceptions import (
+    JobCancelled,
+    JobDeadlineMissed,
+    JobLookupError,
+    ScheduleLookupError,
+)
 from ..abc import DataStore, EventBroker, Trigger
 from ..context import current_scheduler
 from ..datastores.memory import MemoryDataStore
-from ..enums import CoalescePolicy, ConflictPolicy, JobOutcome, RunState
 from ..eventbrokers.local import LocalEventBroker
 from ..events import (
     Event,
@@ -28,12 +34,6 @@ from ..events import (
     SchedulerStopped,
     ScheduleUpdated,
 )
-from ..exceptions import (
-    JobCancelled,
-    JobDeadlineMissed,
-    JobLookupError,
-    ScheduleLookupError,
-)
 from ..marshalling import callable_to_ref
 from ..structures import Job, JobResult, Schedule, Task
 from ..workers.sync import Worker
diff --git a/src/apscheduler/structures.py b/src/apscheduler/structures.py
index 55d5278..148f0db 100644
--- a/src/apscheduler/structures.py
+++ b/src/apscheduler/structures.py
@@ -12,7 +12,7 @@ from attrs.validators import instance_of
 
 from . import abc
 from ._converters import as_enum, as_timedelta
-from .enums import CoalescePolicy, JobOutcome
+from ._enums import CoalescePolicy, JobOutcome
 from .marshalling import callable_from_ref, callable_to_ref
 
 
diff --git a/src/apscheduler/triggers/combining.py b/src/apscheduler/triggers/combining.py
index adc7546..738fb30 100644
--- a/src/apscheduler/triggers/combining.py
+++ b/src/apscheduler/triggers/combining.py
@@ -6,9 +6,9 @@ from typing import Any
 
 import attrs
 
+from .._exceptions import MaxIterationsReached
 from .._validators import as_timedelta, require_state_version
 from ..abc import Trigger
-from ..exceptions import MaxIterationsReached
 from ..marshalling import marshal_object, unmarshal_object
 
 
diff --git a/src/apscheduler/workers/async_.py b/src/apscheduler/workers/async_.py
index 05b4ae1..601fc4e 100644
--- a/src/apscheduler/workers/async_.py
+++ b/src/apscheduler/workers/async_.py
@@ -21,10 +21,10 @@ from anyio import (
 from anyio.abc import CancelScope, TaskGroup
 
 from .._converters import as_async_datastore, as_async_eventbroker
+from .._enums import JobOutcome, RunState
 from .._validators import positive_integer
 from ..abc import AsyncDataStore, AsyncEventBroker, Job
 from ..context import current_worker, job_info
-from ..enums import JobOutcome, RunState
 from ..eventbrokers.async_local import LocalAsyncEventBroker
 from ..events import JobAdded, WorkerStarted, WorkerStopped
 from ..structures import JobInfo, JobResult
diff --git a/src/apscheduler/workers/sync.py b/src/apscheduler/workers/sync.py
index 975608e..686cb26 100644
--- a/src/apscheduler/workers/sync.py
+++ b/src/apscheduler/workers/sync.py
@@ -15,10 +15,10 @@ from uuid import UUID
 
 import attrs
 
+from .._enums import JobOutcome, RunState
 from .._validators import positive_integer
 from ..abc import DataStore, EventBroker
 from ..context import current_worker, job_info
-from ..enums import JobOutcome, RunState
 from ..eventbrokers.local import LocalEventBroker
 from ..events import JobAdded, WorkerStarted, WorkerStopped
 from ..structures import Job, JobInfo, JobResult