From 4505f780241e7b11bc8cdae64cefb57d77a446d8 Mon Sep 17 00:00:00 2001 From: Adrian Moennich Date: Wed, 27 Jul 2016 14:04:04 +0200 Subject: [PATCH] LiveSync: Remove obsolete imports It's still defunct but that way it does not break at import time or when running a zodb importer --- livesync/indico_livesync/base.py | 1 - livesync/indico_livesync/handler.py | 3 +-- livesync/indico_livesync/marcxml.py | 1 - livesync/indico_livesync/models/queue.py | 1 - livesync/indico_livesync/util.py | 2 +- 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/livesync/indico_livesync/base.py b/livesync/indico_livesync/base.py index 6cf8833..3f028b2 100644 --- a/livesync/indico_livesync/base.py +++ b/livesync/indico_livesync/base.py @@ -21,7 +21,6 @@ from flask_pluginengine import depends, trim_docstring from indico.core.plugins import IndicoPlugin, PluginCategory from indico.util.date_time import now_utc from indico.util.decorators import classproperty -from MaKaC.conference import CategoryManager from indico_livesync.forms import AgentForm from indico_livesync.models.queue import LiveSyncQueueEntry diff --git a/livesync/indico_livesync/handler.py b/livesync/indico_livesync/handler.py index 49a56f6..9ee3f49 100644 --- a/livesync/indico_livesync/handler.py +++ b/livesync/indico_livesync/handler.py @@ -29,8 +29,7 @@ from indico.modules.events.contributions.models.contributions import Contributio from indico.modules.events.contributions.models.subcontributions import SubContribution from indico.modules.events.sessions import Session from indico.util.event import unify_event_args -from MaKaC.accessControl import AccessController -from MaKaC.conference import Category, Conference +from MaKaC.conference import Conference from indico_livesync.models.queue import LiveSyncQueueEntry, ChangeType from indico_livesync.util import obj_ref, is_ref_excluded diff --git a/livesync/indico_livesync/marcxml.py b/livesync/indico_livesync/marcxml.py index 43bd486..d0b57a7 100644 --- a/livesync/indico_livesync/marcxml.py +++ b/livesync/indico_livesync/marcxml.py @@ -22,7 +22,6 @@ from indico.modules.users import User from MaKaC.accessControl import AccessWrapper from MaKaC.common.output import outputGenerator from MaKaC.common.xmlGen import XMLGen -from MaKaC.conference import Category from indico_livesync import SimpleChange from indico_livesync.models.queue import EntryType diff --git a/livesync/indico_livesync/models/queue.py b/livesync/indico_livesync/models/queue.py index 5c5eccd..f070877 100644 --- a/livesync/indico_livesync/models/queue.py +++ b/livesync/indico_livesync/models/queue.py @@ -22,7 +22,6 @@ from indico.core.db.sqlalchemy import db, UTCDateTime, PyIntEnum from indico.util.date_time import now_utc from indico.util.string import return_ascii, format_repr from indico.util.struct.enum import IndicoEnum -from MaKaC.conference import CategoryManager from indico_livesync.models.agents import LiveSyncAgent from indico_livesync.util import obj_deref, obj_ref diff --git a/livesync/indico_livesync/util.py b/livesync/indico_livesync/util.py index d1aee1a..b60ba80 100644 --- a/livesync/indico_livesync/util.py +++ b/livesync/indico_livesync/util.py @@ -25,7 +25,7 @@ from indico.modules.events.contributions.models.contributions import Contributio from indico.modules.events.contributions.models.subcontributions import SubContribution from indico.util.caching import memoize_request from indico.util.date_time import now_utc -from MaKaC.conference import Category, CategoryManager, Conference +from MaKaC.conference import Conference def obj_ref(obj):