Cleanups

openlp/core/theme/theme.py

@@ -203,7 +203,7 @@ class Theme(object):
                             val = element_text
                 if (element.tag.find(u'Color') > 0 or
                     (element.tag.find(u'BackgroundParameter') == 0 and
-                    type(val) == type(0))):
+                    isinstance(int, val))):
                     # convert to a wx.Colour
                     if not delphi_color_change:
                         val = QtGui.QColor(

openlp/core/ui/maindisplay.py

@@ -538,7 +538,7 @@ class VideoDisplay(Phonon.VideoWidget):
         """
         self.onMediaStop()
         for path in self.outputPaths():
-            disconnected = path.disconnect()
+            path.disconnect()
 
 #    def onMediaBackground(self, message=None):
 #        """
@@ -664,7 +664,7 @@ class AudioPlayer(QtCore.QObject):
         """
         self.onMediaStop()
         for path in self.mediaObject.outputPaths():
-            disconnected = path.disconnect()
+            path.disconnect()
 
     def onMediaQueue(self, message):
         """

openlp/core/ui/servicemanager.py

@@ -33,7 +33,8 @@ log = logging.getLogger(__name__)
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import OpenLPToolbar, ServiceItem, context_menu_action, \
-    Receiver, build_icon, ItemCapabilities, SettingsManager, translate, ThemeLevel
+    Receiver, build_icon, ItemCapabilities, SettingsManager, translate, \
+    ThemeLevel
 from openlp.core.ui import ServiceNoteForm, ServiceItemEditForm
 from openlp.core.utils import AppLocation