Merge differing trees and remove whitspaces

openlp/core/lib/toolbar.py

@@ -31,7 +31,6 @@ import logging
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_widget_action
 
 log = logging.getLogger(__name__)

openlp/core/ui/mainwindow.py

@@ -1386,12 +1386,12 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         self.recentFilesMenu.clear()
         for fileId, filename in enumerate(recentFilesToDisplay):
             log.debug('Recent file name: %s', filename)
-            action =  create_action(self, u'',
+            action = create_action(self, u'',
                 text=u'&%d %s' % (fileId + 1, os.path.splitext(os.path.basename(
                 unicode(filename)))[0]), data=filename,
                 triggers=self.serviceManagerContents.onRecentServiceClicked)
             self.recentFilesMenu.addAction(action)
-        clearRecentFilesAction =  create_action(self, u'',
+        clearRecentFilesAction = create_action(self, u'',
             text=translate('OpenLP.MainWindow', 'Clear List',
             'Clear List of recent files'),
             statustip=translate('OpenLP.MainWindow',

openlp/core/ui/media/vlc.py

@@ -126,7 +126,7 @@ class VLCException(Exception):
 try:
     _Ints = (int, long)
 except NameError:  # no long in Python 3+
-    _Ints =  int
+    _Ints = int
 
 # Default instance. It is used to instanciate classes directly in the
 # OO-wrapper.

openlp/core/ui/media/vlcplayer.py

@@ -49,7 +49,7 @@ from openlp.core.ui.media import MediaState
 
 log = logging.getLogger(__name__)
 
-AUDIO_EXT =  [
+AUDIO_EXT = [
       u'*.mp3'
     , u'*.wav'
     , u'*.ogg'

openlp/core/ui/media/webkitplayer.py

@@ -246,7 +246,7 @@ VIDEO_EXT = [
             , u'*.swf'
         ]
 
-AUDIO_EXT =  [
+AUDIO_EXT = [
               u'*.mp3'
             , u'*.ogg'
         ]

openlp/core/ui/themestab.py

@@ -39,7 +39,7 @@ class ThemesTab(SettingsTab):
         self.mainwindow = mainwindow
         generalTranslated = translate('OpenLP.ThemesTab', 'Themes')
         SettingsTab.__init__(self, parent, u'Themes', generalTranslated)
-        self.icon_path =  u':/themes/theme_new.png'
+        self.icon_path = u':/themes/theme_new.png'
 
     def setupUi(self):
         self.setObjectName(u'ThemesTab')

openlp/plugins/alerts/alertsplugin.py

@@ -137,7 +137,7 @@ class AlertsPlugin(Plugin):
             text=translate('AlertsPlugin', '&Alert'),
             icon=u':/plugins/plugin_alerts.png',
             statustip=translate('AlertsPlugin', 'Show an alert message.'),
-            visible=False, shortcuts=u'F7', triggers=self.onAlertsTrigger)
+            visible=False, shortcuts=[u'F7'], triggers=self.onAlertsTrigger)
         self.serviceManager.mainwindow.toolsMenu.addAction(self.toolsAlertItem)
 
     def initialise(self):

openlp/plugins/bibles/lib/__init__.py

@@ -89,7 +89,7 @@ def update_reference_separators():
         while u'||' in source_string:
             source_string = source_string.replace(u'||', u'|')
         if role != u'e':
-            REFERENCE_SEPARATORS[u'sep_%s_display' % role] =  \
+            REFERENCE_SEPARATORS[u'sep_%s_display' % role] = \
                 source_string.split(u'|')[0]
         # escape reserved characters
         for character in u'\\.^$*+?{}[]()':

openlp/plugins/songs/lib/opensongimport.py

@@ -238,7 +238,7 @@ class OpenSongImport(SongImport):
                     verse_tag = match.group(1)
                     verse_num = match.group(2)
                     if not len(verse_tag):
-                        verse_tag =  VerseType.Tags[VerseType.Verse]
+                        verse_tag = VerseType.Tags[VerseType.Verse]
                 else:
                     # Assume it's no.1 if there are no digits
                     verse_tag = verse_def