From aa0875cd0d927bc81cb20fb7c221e01a618a5e8b Mon Sep 17 00:00:00 2001 From: Adrian Moennich Date: Wed, 11 Nov 2020 12:58:43 +0100 Subject: [PATCH] Use more explicit imports --- livesync/indico_livesync/__init__.py | 12 ++++++------ livesync/indico_livesync/marcxml.py | 2 +- livesync/indico_livesync/uploader.py | 3 ++- livesync/tests/simplify_test.py | 2 +- livesync/tests/uploader_test.py | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/livesync/indico_livesync/__init__.py b/livesync/indico_livesync/__init__.py index cb433a7..d67b23c 100644 --- a/livesync/indico_livesync/__init__.py +++ b/livesync/indico_livesync/__init__.py @@ -8,16 +8,16 @@ from indico.core import signals from indico.util.i18n import make_bound_gettext - _ = make_bound_gettext('livesync') __all__ = ('LiveSyncPluginBase', 'LiveSyncBackendBase', 'AgentForm', 'SimpleChange', 'process_records', 'MARCXMLGenerator', 'Uploader', 'MARCXMLUploader') -from .base import LiveSyncBackendBase, LiveSyncPluginBase # noqa:E402 -from .forms import AgentForm # noqa:E402 -from .marcxml import MARCXMLGenerator # noqa:E402 -from .simplify import SimpleChange, process_records # noqa:E402 -from .uploader import MARCXMLUploader, Uploader # noqa:E402 + +from .base import LiveSyncBackendBase, LiveSyncPluginBase # noqa: E402 +from .forms import AgentForm # noqa: E402 +from .marcxml import MARCXMLGenerator # noqa: E402 +from .simplify import SimpleChange, process_records # noqa: E402 +from .uploader import MARCXMLUploader, Uploader # noqa: E402 @signals.import_tasks.connect diff --git a/livesync/indico_livesync/marcxml.py b/livesync/indico_livesync/marcxml.py index 4dcda1c..55895d5 100644 --- a/livesync/indico_livesync/marcxml.py +++ b/livesync/indico_livesync/marcxml.py @@ -15,7 +15,7 @@ from indico.modules.events.contributions.models.subcontributions import SubContr from indico.modules.events.models.events import Event from indico.modules.users import User -from indico_livesync import SimpleChange +from indico_livesync.simplify import SimpleChange from indico_livesync.util import compound_id, obj_ref diff --git a/livesync/indico_livesync/uploader.py b/livesync/indico_livesync/uploader.py index 8bdd8c3..d349297 100644 --- a/livesync/indico_livesync/uploader.py +++ b/livesync/indico_livesync/uploader.py @@ -8,7 +8,8 @@ from indico.core.db import db from indico.util.struct.iterables import grouper -from indico_livesync import MARCXMLGenerator, process_records +from indico_livesync.marcxml import MARCXMLGenerator +from indico_livesync.simplify import process_records class Uploader: diff --git a/livesync/tests/simplify_test.py b/livesync/tests/simplify_test.py index 8f48877..6c3cece 100644 --- a/livesync/tests/simplify_test.py +++ b/livesync/tests/simplify_test.py @@ -9,8 +9,8 @@ import pytest from indico.testing.util import bool_matrix -from indico_livesync import SimpleChange, process_records from indico_livesync.models.queue import ChangeType, EntryType, LiveSyncQueueEntry +from indico_livesync.simplify import SimpleChange, process_records class Dummy: diff --git a/livesync/tests/uploader_test.py b/livesync/tests/uploader_test.py index c8c36b2..890db11 100644 --- a/livesync/tests/uploader_test.py +++ b/livesync/tests/uploader_test.py @@ -9,7 +9,7 @@ from unittest.mock import MagicMock, Mock from indico.modules.events import Event -from indico_livesync import SimpleChange +from indico_livesync.simplify import SimpleChange from indico_livesync.models.queue import ChangeType, EntryType, LiveSyncQueueEntry from indico_livesync.uploader import MARCXMLUploader, Uploader