From d33f393557f84b3bfaa0b0c714671da00f75606c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi>
Date: Sun, 31 Jul 2022 00:28:30 +0300
Subject: Made the apscheduler.events module private and re-exported its code

---
 tests/test_datastores.py   | 19 +++++++++++--------
 tests/test_eventbrokers.py |  2 +-
 tests/test_schedulers.py   | 14 ++++++--------
 tests/test_serializers.py  |  2 +-
 tests/test_workers.py      |  9 +++++----
 5 files changed, 24 insertions(+), 22 deletions(-)

(limited to 'tests')

diff --git a/tests/test_datastores.py b/tests/test_datastores.py
index 51e11b4..22722c7 100644
--- a/tests/test_datastores.py
+++ b/tests/test_datastores.py
@@ -14,21 +14,24 @@ from anyio import CancelScope
 from freezegun.api import FrozenDateTimeFactory
 from pytest_lazyfixture import lazy_fixture
 
-from apscheduler import CoalescePolicy, ConflictPolicy, JobOutcome, TaskLookupError
-from apscheduler._structures import Job, JobResult, Schedule, Task
-from apscheduler.abc import AsyncDataStore, AsyncEventBroker, DataStore, EventBroker
-from apscheduler.datastores.async_adapter import AsyncDataStoreAdapter
-from apscheduler.datastores.memory import MemoryDataStore
-from apscheduler.eventbrokers.async_local import LocalAsyncEventBroker
-from apscheduler.eventbrokers.local import LocalEventBroker
-from apscheduler.events import (
+from apscheduler import (
+    CoalescePolicy,
+    ConflictPolicy,
     Event,
+    JobOutcome,
     ScheduleAdded,
     ScheduleRemoved,
     ScheduleUpdated,
     TaskAdded,
+    TaskLookupError,
     TaskUpdated,
 )
+from apscheduler._structures import Job, JobResult, Schedule, Task
+from apscheduler.abc import AsyncDataStore, AsyncEventBroker, DataStore, EventBroker
+from apscheduler.datastores.async_adapter import AsyncDataStoreAdapter
+from apscheduler.datastores.memory import MemoryDataStore
+from apscheduler.eventbrokers.async_local import LocalAsyncEventBroker
+from apscheduler.eventbrokers.local import LocalEventBroker
 from apscheduler.triggers.date import DateTrigger
 
 
diff --git a/tests/test_eventbrokers.py b/tests/test_eventbrokers.py
index cacfbcd..d2974c0 100644
--- a/tests/test_eventbrokers.py
+++ b/tests/test_eventbrokers.py
@@ -12,8 +12,8 @@ from _pytest.logging import LogCaptureFixture
 from anyio import CancelScope, create_memory_object_stream, fail_after
 from pytest_lazyfixture import lazy_fixture
 
+from apscheduler import Event, ScheduleAdded
 from apscheduler.abc import AsyncEventBroker, EventBroker, Serializer
-from apscheduler.events import Event, ScheduleAdded
 
 
 @pytest.fixture
diff --git a/tests/test_schedulers.py b/tests/test_schedulers.py
index 54c6bbf..e25f0ee 100644
--- a/tests/test_schedulers.py
+++ b/tests/test_schedulers.py
@@ -12,24 +12,22 @@ from anyio import fail_after
 from pytest_mock import MockerFixture
 
 from apscheduler import (
+    Event,
     Job,
+    JobAdded,
     JobLookupError,
     JobOutcome,
     Schedule,
+    ScheduleAdded,
     ScheduleLookupError,
+    ScheduleRemoved,
+    SchedulerStopped,
     Task,
+    TaskAdded,
     current_scheduler,
     current_worker,
     job_info,
 )
-from apscheduler.events import (
-    Event,
-    JobAdded,
-    ScheduleAdded,
-    ScheduleRemoved,
-    SchedulerStopped,
-    TaskAdded,
-)
 from apscheduler.schedulers.async_ import AsyncScheduler
 from apscheduler.schedulers.sync import Scheduler
 from apscheduler.triggers.date import DateTrigger
diff --git a/tests/test_serializers.py b/tests/test_serializers.py
index b1ee232..28f691d 100644
--- a/tests/test_serializers.py
+++ b/tests/test_serializers.py
@@ -4,8 +4,8 @@ from uuid import uuid4
 
 import pytest
 
+from apscheduler import Event, JobAdded
 from apscheduler.abc import Serializer
-from apscheduler.events import Event, JobAdded
 
 
 @pytest.mark.parametrize(
diff --git a/tests/test_workers.py b/tests/test_workers.py
index 7f86aca..5d02375 100644
--- a/tests/test_workers.py
+++ b/tests/test_workers.py
@@ -8,17 +8,18 @@ import anyio
 import pytest
 from anyio import fail_after
 
-from apscheduler import Job, JobOutcome
-from apscheduler._structures import Task
-from apscheduler.datastores.memory import MemoryDataStore
-from apscheduler.events import (
+from apscheduler import (
     Event,
+    Job,
     JobAcquired,
     JobAdded,
+    JobOutcome,
     JobReleased,
     TaskAdded,
     WorkerStopped,
 )
+from apscheduler._structures import Task
+from apscheduler.datastores.memory import MemoryDataStore
 from apscheduler.workers.async_ import AsyncWorker
 from apscheduler.workers.sync import Worker
 
-- 
cgit v1.2.1