Fix __init__ calling and imports

This commit is contained in:
Jon Tibble 2010-06-01 01:05:05 +01:00
parent 83354166da
commit bea44a5124
4 changed files with 6 additions and 10 deletions

View File

@ -33,8 +33,9 @@ from BeautifulSoup import BeautifulSoup, Tag, NavigableString
from openlp.core.lib import Receiver from openlp.core.lib import Receiver
from openlp.core.utils import AppLocation from openlp.core.utils import AppLocation
from common import BibleCommon, SearchResults, unescape from openlp.plugins.bibles.lib.common import BibleCommon, SearchResults, \
from db import BibleDB unescape
from openlp.plugins.bibles.lib.db import BibleDB
from openlp.plugins.bibles.lib.models import Book from openlp.plugins.bibles.lib.models import Book
log = logging.getLogger(__name__) log = logging.getLogger(__name__)

View File

@ -176,14 +176,12 @@ class ImpressController(PresentationController):
return doc return doc
class ImpressDocument(PresentationDocument): class ImpressDocument(PresentationDocument):
def __init__(self, controller, presentation): def __init__(self, controller, presentation):
log.debug(u'Init Presentation OpenOffice') log.debug(u'Init Presentation OpenOffice')
self.controller = controller PresentationDocument.__init__(controller, presentation)
self.document = None self.document = None
self.presentation = None self.presentation = None
self.control = None self.control = None
self.store_filename(presentation)
def load_presentation(self): def load_presentation(self):
""" """

View File

@ -102,12 +102,10 @@ class PowerpointController(PresentationController):
return doc return doc
class PowerpointDocument(PresentationDocument): class PowerpointDocument(PresentationDocument):
def __init__(self, controller, presentation): def __init__(self, controller, presentation):
log.debug(u'Init Presentation Powerpoint') log.debug(u'Init Presentation Powerpoint')
PresentationDocument.__init__(controller, presentation)
self.presentation = None self.presentation = None
self.controller = controller
self.store_filename(presentation)
def load_presentation(self): def load_presentation(self):
""" """

View File

@ -102,11 +102,10 @@ class PptviewController(PresentationController):
class PptviewDocument(PresentationDocument): class PptviewDocument(PresentationDocument):
def __init__(self, controller, presentation): def __init__(self, controller, presentation):
log.debug(u'Init Presentation PowerPoint') log.debug(u'Init Presentation PowerPoint')
PresentationDocument.__init__(controller, presentation)
self.presentation = None self.presentation = None
self.pptid = None self.pptid = None
self.blanked = False self.blanked = False
self.controller = controller
self.store_filename(presentation)
def load_presentation(self): def load_presentation(self):
""" """