diff --git a/openlp/core/lib/plugin.py b/openlp/core/lib/plugin.py index 1950477ed..641969392 100644 --- a/openlp/core/lib/plugin.py +++ b/openlp/core/lib/plugin.py @@ -128,7 +128,7 @@ class Plugin(QtCore.QObject): class MyPlugin(Plugin): def __init__(self): - Plugin.__init__(self, u'MyPlugin', version=u'0.1') + super(MyPlugin, self).__init__('MyPlugin', version=u'0.1') ``name`` Defaults to *None*. The name of the plugin. @@ -146,7 +146,7 @@ class Plugin(QtCore.QObject): Defaults to *None*, which means that the same version number is used as OpenLP's version number. """ log.debug(u'Plugin %s initialised' % name) - QtCore.QObject.__init__(self) + super(Plugin, self).__init__() self.name = name self.text_strings = {} self.set_plugin_text_strings() diff --git a/openlp/plugins/alerts/alertsplugin.py b/openlp/plugins/alerts/alertsplugin.py index a2d77c42b..fe11db753 100644 --- a/openlp/plugins/alerts/alertsplugin.py +++ b/openlp/plugins/alerts/alertsplugin.py @@ -129,7 +129,7 @@ class AlertsPlugin(Plugin): log.info(u'Alerts Plugin loaded') def __init__(self): - Plugin.__init__(self, u'alerts', __default_settings__, settings_tab_class=AlertsTab) + super(AlertsPlugin, self).__init__(u'alerts', __default_settings__, settings_tab_class=AlertsTab) self.weight = -3 self.icon_path = u':/plugins/plugin_alerts.png' self.icon = build_icon(self.icon_path) diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index e2888d67a..7f8f0782c 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -69,7 +69,7 @@ class BiblePlugin(Plugin): log.info(u'Bible Plugin loaded') def __init__(self): - Plugin.__init__(self, u'bibles', __default_settings__, BibleMediaItem, BiblesTab) + super(BiblePlugin, self).__init__(u'bibles', __default_settings__, BibleMediaItem, BiblesTab) self.weight = -9 self.icon_path = u':/plugins/plugin_bibles.png' self.icon = build_icon(self.icon_path) diff --git a/openlp/plugins/custom/customplugin.py b/openlp/plugins/custom/customplugin.py index 06b070490..b237e4624 100644 --- a/openlp/plugins/custom/customplugin.py +++ b/openlp/plugins/custom/customplugin.py @@ -61,7 +61,7 @@ class CustomPlugin(Plugin): log.info(u'Custom Plugin loaded') def __init__(self): - Plugin.__init__(self, u'custom', __default_settings__, CustomMediaItem, CustomTab) + super(CustomPlugin, self).__init__(u'custom', __default_settings__, CustomMediaItem, CustomTab) self.weight = -5 self.manager = Manager(u'custom', init_schema) self.icon_path = u':/plugins/plugin_custom.png' diff --git a/openlp/plugins/images/imageplugin.py b/openlp/plugins/images/imageplugin.py index dfe927a7b..7717ae1ae 100644 --- a/openlp/plugins/images/imageplugin.py +++ b/openlp/plugins/images/imageplugin.py @@ -48,7 +48,7 @@ class ImagePlugin(Plugin): log.info(u'Image Plugin loaded') def __init__(self): - Plugin.__init__(self, u'images', __default_settings__, ImageMediaItem, ImageTab) + super(ImagePlugin, self).__init__(u'images', __default_settings__, ImageMediaItem, ImageTab) self.manager = Manager(u'images', init_schema) self.weight = -7 self.icon_path = u':/plugins/plugin_images.png' diff --git a/openlp/plugins/media/mediaplugin.py b/openlp/plugins/media/mediaplugin.py index 38cd9bb69..0cc8345c1 100644 --- a/openlp/plugins/media/mediaplugin.py +++ b/openlp/plugins/media/mediaplugin.py @@ -49,7 +49,7 @@ class MediaPlugin(Plugin): log.info(u'%s MediaPlugin loaded', __name__) def __init__(self): - Plugin.__init__(self, u'media', __default_settings__, MediaMediaItem) + super(MediaPlugin, self).__init__(u'media', __default_settings__, MediaMediaItem) self.weight = -6 self.icon_path = u':/plugins/plugin_media.png' self.icon = build_icon(self.icon_path) diff --git a/openlp/plugins/presentations/lib/pptviewcontroller.py b/openlp/plugins/presentations/lib/pptviewcontroller.py index 01c4100cc..06872ef36 100644 --- a/openlp/plugins/presentations/lib/pptviewcontroller.py +++ b/openlp/plugins/presentations/lib/pptviewcontroller.py @@ -109,7 +109,7 @@ class PptviewDocument(PresentationDocument): Constructor, store information about the file and initialise. """ log.debug(u'Init Presentation PowerPoint') - PresentationDocument.__init__(self, controller, presentation) + super(PptviewDocument, self).__init__(controller, presentation) self.presentation = None self.ppt_id = None self.blanked = False diff --git a/openlp/plugins/remotes/remoteplugin.py b/openlp/plugins/remotes/remoteplugin.py index f443fbda4..ea6d01551 100644 --- a/openlp/plugins/remotes/remoteplugin.py +++ b/openlp/plugins/remotes/remoteplugin.py @@ -55,7 +55,7 @@ class RemotesPlugin(Plugin): """ remotes constructor """ - Plugin.__init__(self, u'remotes', __default_settings__, settings_tab_class=RemoteTab) + super(RemotePlugin, self).__init__(u'remotes', __default_settings__, settings_tab_class=RemoteTab) self.icon_path = u':/plugins/plugin_remote.png' self.icon = build_icon(self.icon_path) self.weight = -1 diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py index c9cf22534..0e1cb69df 100644 --- a/openlp/plugins/songs/songsplugin.py +++ b/openlp/plugins/songs/songsplugin.py @@ -80,7 +80,7 @@ class SongsPlugin(Plugin): """ Create and set up the Songs plugin. """ - Plugin.__init__(self, u'songs', __default_settings__, SongMediaItem, SongsTab) + super(SongsPlugin, self).__init__(u'songs', __default_settings__, SongMediaItem, SongsTab) self.manager = Manager(u'songs', init_schema, upgrade_mod=upgrade) self.weight = -10 self.icon_path = u':/plugins/plugin_songs.png' diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py index 7a730c992..4173d5d9d 100644 --- a/openlp/plugins/songusage/songusageplugin.py +++ b/openlp/plugins/songusage/songusageplugin.py @@ -60,7 +60,7 @@ class SongUsagePlugin(Plugin): log.info(u'SongUsage Plugin loaded') def __init__(self): - Plugin.__init__(self, u'songusage', __default_settings__) + super(SongUsagePlugin, self).__init__(u'songusage', __default_settings__) self.manager = Manager(u'songusage', init_schema, upgrade_mod=upgrade) self.weight = -4 self.icon = build_icon(u':/plugins/plugin_songusage.png')