Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/fix-circ-deps into lp:openlp.
Commit message: Remove the circular dependency problems in the custom slide plugin. Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~raoul-snyman/openlp/fix-circ-deps/+merge/357901 -- Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/fix-circ-deps into lp:openlp.
=== modified file 'openlp/plugins/custom/customplugin.py' --- openlp/plugins/custom/customplugin.py 2018-08-25 14:08:19 +0000 +++ openlp/plugins/custom/customplugin.py 2018-10-26 22:04:32 +0000 @@ -33,9 +33,9 @@ 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__) === modified file 'openlp/plugins/custom/forms/editcustomform.py' --- openlp/plugins/custom/forms/editcustomform.py 2017-12-29 09:15:48 +0000 +++ openlp/plugins/custom/forms/editcustomform.py 2018-10-26 22:04:32 +0000 @@ -27,10 +27,10 @@ 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__) === modified file 'openlp/plugins/custom/lib/__init__.py' --- openlp/plugins/custom/lib/__init__.py 2017-12-29 09:15:48 +0000 +++ openlp/plugins/custom/lib/__init__.py 2018-10-26 22:04:32 +0000 @@ -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 === modified file 'openlp/plugins/custom/lib/mediaitem.py' --- openlp/plugins/custom/lib/mediaitem.py 2018-08-25 14:08:19 +0000 +++ openlp/plugins/custom/lib/mediaitem.py 2018-10-26 22:04:32 +0000 @@ -35,7 +35,7 @@ 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__) === modified file 'tests/functional/openlp_plugins/custom/test_mediaitem.py' --- tests/functional/openlp_plugins/custom/test_mediaitem.py 2018-08-25 14:08:19 +0000 +++ tests/functional/openlp_plugins/custom/test_mediaitem.py 2018-10-26 22:04:32 +0000 @@ -30,7 +30,7 @@ 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']
_______________________________________________ Mailing list: https://launchpad.net/~openlp-core Post to : [email protected] Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
