From 74607afbfcb925267248003fd04ac83b7b5cc96b Mon Sep 17 00:00:00 2001 From: Philip Ridout Date: Tue, 9 Aug 2016 20:32:29 +0100 Subject: [PATCH] Add OpenLPMixin to bible importer --- openlp/plugins/bibles/lib/bibleimport.py | 5 ++--- openlp/plugins/bibles/lib/csvbible.py | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/openlp/plugins/bibles/lib/bibleimport.py b/openlp/plugins/bibles/lib/bibleimport.py index a4313f5f6..4d015223b 100644 --- a/openlp/plugins/bibles/lib/bibleimport.py +++ b/openlp/plugins/bibles/lib/bibleimport.py @@ -24,20 +24,19 @@ import logging from lxml import etree, objectify -from openlp.core.common import languages +from openlp.core.common import OpenLPMixin, languages from openlp.core.lib import ValidationError from openlp.plugins.bibles.lib.db import BibleDB, BiblesResourcesDB log = logging.getLogger(__name__) -class BibleImport(BibleDB): +class BibleImport(OpenLPMixin, BibleDB): """ Helper class to import bibles from a third party source into OpenLP """ # TODO: Test def __init__(self, *args, **kwargs): - log.debug(self.__class__.__name__) super().__init__(*args, **kwargs) self.filename = kwargs['filename'] if 'filename' in kwargs else None diff --git a/openlp/plugins/bibles/lib/csvbible.py b/openlp/plugins/bibles/lib/csvbible.py index 8206f71e8..549cec581 100644 --- a/openlp/plugins/bibles/lib/csvbible.py +++ b/openlp/plugins/bibles/lib/csvbible.py @@ -53,11 +53,9 @@ import csv import logging from collections import namedtuple -from openlp.core.common import translate -from openlp.core.lib import get_file_encoding +from openlp.core.common import get_file_encoding, translate from openlp.core.lib.exceptions import ValidationError from openlp.plugins.bibles.lib.bibleimport import BibleImport -from openlp.plugins.bibles.lib.db import BiblesResourcesDB log = logging.getLogger(__name__)