forked from openlp/openlp
Attempt to remove/reduce circular imports
This commit is contained in:
parent
891f1dc397
commit
4bed8eabed
@ -33,9 +33,9 @@ from openlp.core.lib import build_icon
|
||||
from openlp.core.lib.plugin import Plugin, StringContent
|
||||
from openlp.core.lib.db import Manager
|
||||
from openlp.plugins.custom.endpoint import api_custom_endpoint, custom_endpoint
|
||||
from openlp.plugins.custom.lib import CustomMediaItem, CustomTab
|
||||
from openlp.plugins.custom.lib.db import CustomSlide, init_schema
|
||||
from openlp.plugins.custom.lib.mediaitem import CustomSearch
|
||||
from openlp.plugins.custom.lib.mediaitem import CustomMediaItem, CustomSearch
|
||||
from openlp.plugins.custom.lib.customtab import CustomTab
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
@ -27,10 +27,10 @@ from PyQt5 import QtCore, QtWidgets
|
||||
from openlp.core.common.i18n import translate
|
||||
from openlp.core.common.registry import Registry
|
||||
from openlp.core.lib.ui import critical_error_message_box, find_and_set_in_combo_box
|
||||
from openlp.plugins.custom.lib import CustomXMLBuilder, CustomXMLParser
|
||||
from openlp.plugins.custom.forms.editcustomdialog import Ui_CustomEditDialog
|
||||
from openlp.plugins.custom.forms.editcustomslideform import EditCustomSlideForm
|
||||
from openlp.plugins.custom.lib.customxmlhandler import CustomXMLBuilder, CustomXMLParser
|
||||
from openlp.plugins.custom.lib.db import CustomSlide
|
||||
from .editcustomdialog import Ui_CustomEditDialog
|
||||
from .editcustomslideform import EditCustomSlideForm
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
@ -19,7 +19,3 @@
|
||||
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
|
||||
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
||||
###############################################################################
|
||||
|
||||
from .customtab import CustomTab
|
||||
from .customxmlhandler import CustomXMLBuilder, CustomXMLParser
|
||||
from .mediaitem import CustomMediaItem
|
||||
|
@ -35,7 +35,7 @@ from openlp.core.lib.plugin import PluginStatus
|
||||
from openlp.core.lib.ui import create_widget_action
|
||||
from openlp.core.ui.icons import UiIcons
|
||||
from openlp.plugins.custom.forms.editcustomform import EditCustomForm
|
||||
from openlp.plugins.custom.lib import CustomXMLParser, CustomXMLBuilder
|
||||
from openlp.plugins.custom.lib.customxmlhandler import CustomXMLBuilder, CustomXMLParser
|
||||
from openlp.plugins.custom.lib.db import CustomSlide
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
@ -30,7 +30,7 @@ from PyQt5 import QtCore
|
||||
from openlp.core.common.registry import Registry
|
||||
from openlp.core.lib.plugin import PluginStatus
|
||||
from openlp.core.lib.serviceitem import ServiceItem
|
||||
from openlp.plugins.custom.lib import CustomMediaItem
|
||||
from openlp.plugins.custom.lib.mediaitem import CustomMediaItem
|
||||
from tests.helpers.testmixin import TestMixin
|
||||
|
||||
FOOTER = ['Arky Arky (Unknown)', 'Public Domain', 'CCLI 123456']
|
||||
|
Loading…
Reference in New Issue
Block a user