forked from openlp/openlp
Make importer inits consistent
This commit is contained in:
parent
fb120858e0
commit
4d1f1e933e
|
@ -50,12 +50,12 @@ class OooImport(SongImport):
|
|||
"""
|
||||
Import songs from Impress/Powerpoint docs using Impress
|
||||
"""
|
||||
def __init__(self, master_manager, **kwargs):
|
||||
def __init__(self, manager, **kwargs):
|
||||
"""
|
||||
Initialise the class. Requires a songmanager class which is passed
|
||||
to SongImport for writing song to disk
|
||||
"""
|
||||
SongImport.__init__(self, master_manager, **kwargs)
|
||||
SongImport.__init__(self, manager, **kwargs)
|
||||
self.document = None
|
||||
self.process_started = False
|
||||
|
||||
|
|
|
@ -43,12 +43,12 @@ class OpenLyricsImport(SongImport):
|
|||
"""
|
||||
This provides the Openlyrics import.
|
||||
"""
|
||||
def __init__(self, master_manager, **kwargs):
|
||||
def __init__(self, manager, **kwargs):
|
||||
"""
|
||||
Initialise the import.
|
||||
Initialise the Open Lyrics importer.
|
||||
"""
|
||||
log.debug(u'initialise OpenLyricsImport')
|
||||
SongImport.__init__(self, master_manager, **kwargs)
|
||||
SongImport.__init__(self, manager, **kwargs)
|
||||
self.openLyrics = OpenLyrics(self.manager)
|
||||
|
||||
def do_import(self):
|
||||
|
|
|
@ -66,12 +66,12 @@ class SofImport(OooImport):
|
|||
It attempts to detect italiced verses, and treats these as choruses in
|
||||
the verse ordering. Again not perfect, but a start.
|
||||
"""
|
||||
def __init__(self, master_manager, **kwargs):
|
||||
def __init__(self, manager, **kwargs):
|
||||
"""
|
||||
Initialise the class. Requires a songmanager class which is passed
|
||||
to SongImport for writing song to disk
|
||||
"""
|
||||
OooImport.__init__(self, master_manager, **kwargs)
|
||||
OooImport.__init__(self, manager, **kwargs)
|
||||
|
||||
def process_ooo_document(self):
|
||||
"""
|
||||
|
|
|
@ -67,14 +67,11 @@ class SongBeamerImport(SongImport):
|
|||
Song Beamer file format is text based
|
||||
in the beginning are one or more control tags written
|
||||
"""
|
||||
def __init__(self, master_manager, **kwargs):
|
||||
def __init__(self, manager, **kwargs):
|
||||
"""
|
||||
Initialise the import.
|
||||
|
||||
``master_manager``
|
||||
The song manager for the running OpenLP installation.
|
||||
Initialise the Song Beamer importer.
|
||||
"""
|
||||
SongImport.__init__(self, master_manager, **kwargs)
|
||||
SongImport.__init__(self, manager, **kwargs)
|
||||
|
||||
def do_import(self):
|
||||
"""
|
||||
|
|
|
@ -86,14 +86,11 @@ class SongShowPlusImport(SongImport):
|
|||
otherList = {}
|
||||
otherCount = 0
|
||||
|
||||
def __init__(self, master_manager, **kwargs):
|
||||
def __init__(self, manager, **kwargs):
|
||||
"""
|
||||
Initialise the import.
|
||||
|
||||
``master_manager``
|
||||
The song manager for the running OpenLP installation.
|
||||
Initialise the SongShow Plus importer.
|
||||
"""
|
||||
SongImport.__init__(self, master_manager, **kwargs)
|
||||
SongImport.__init__(self, manager, **kwargs)
|
||||
|
||||
def do_import(self):
|
||||
"""
|
||||
|
|
|
@ -92,14 +92,11 @@ class WowImport(SongImport):
|
|||
* .wow-song
|
||||
"""
|
||||
|
||||
def __init__(self, master_manager, **kwargs):
|
||||
def __init__(self, manager, **kwargs):
|
||||
"""
|
||||
Initialise the import.
|
||||
|
||||
``master_manager``
|
||||
The song manager for the running OpenLP installation.
|
||||
Initialise the Words of Worship importer.
|
||||
"""
|
||||
SongImport.__init__(self, master_manager, **kwargs)
|
||||
SongImport.__init__(self, manager, **kwargs)
|
||||
|
||||
def do_import(self):
|
||||
"""
|
||||
|
|
Loading…
Reference in New Issue