Truth test and C style cleanups

bzr-revno: 731

openlp/core/lib/__init__.py

@@ -146,7 +146,7 @@ def resize_image(image, width, height):
     preview = QtGui.QImage(image)
     preview = preview.scaled(width, height, QtCore.Qt.KeepAspectRatio,
         QtCore.Qt.SmoothTransformation)
-    realw = preview.width();
+    realw = preview.width()
     realh = preview.height()
     # and move it to the centre of the preview space
     newImage = QtGui.QImage(width, height, QtGui.QImage.Format_ARGB32_Premultiplied)

openlp/core/lib/mediamanageritem.py

@@ -314,7 +314,7 @@ class MediaManagerItem(QtGui.QWidget):
             self, self.OnNewPrompt,
             self.parent.config.get_last_dir(), self.OnNewFileMasks)
         log.info(u'New files(s)%s', unicode(files))
-        if len(files) > 0:
+        if files:
             self.loadList(files)
             dir, filename = os.path.split(unicode(files[0]))
             self.parent.config.set_last_dir(dir)

openlp/core/lib/renderer.py

@@ -174,7 +174,7 @@ class Renderer(object):
             #Must be a blank line so keep it.
             if len(line) == 0:
                 line = u' '
-            while len(line) > 0:
+            while line:
                 pos = char_per_line
                 split_text = line[:pos]
                 #line needs splitting
@@ -199,7 +199,7 @@ class Renderer(object):
                 split_lines.append(split_text)
                 line = line[pos:].lstrip()
                 #if we have more text add up to 10 spaces on the front.
-                if len(line) > 0 and self._theme.font_main_indentation > 0:
+                if line and self._theme.font_main_indentation > 0:
                     line = u'%s%s' % \
                         (u'          '[:int(self._theme.font_main_indentation)], line)
                 #Text fits in a line now
@@ -210,7 +210,7 @@ class Renderer(object):
                 len(page) == page_length:
                 split_pages.append(page)
                 page = []
-        if len(page) > 0 and page != u' ':
+        if page and page != u' ':
             split_pages.append(page)
         return split_pages
 
@@ -406,8 +406,8 @@ class Renderer(object):
             Defaults to *False*. Whether or not this is a live screen.
         """
         x, y = tlcorner
-        maxx = self._rect.width();
+        maxx = self._rect.width()
-        maxy = self._rect.height();
+        maxy = self._rect.height()
         lines = []
         lines.append(line)
         startx = x
@@ -415,11 +415,11 @@ class Renderer(object):
         rightextent = None
         self.painter = QtGui.QPainter()
         self.painter.begin(self._frame)
-        self.painter.setRenderHint(QtGui.QPainter.Antialiasing);
+        self.painter.setRenderHint(QtGui.QPainter.Antialiasing)
         if self._theme.display_slideTransition:
             self.painter2 = QtGui.QPainter()
             self.painter2.begin(self._frameOp)
-            self.painter2.setRenderHint(QtGui.QPainter.Antialiasing);
+            self.painter2.setRenderHint(QtGui.QPainter.Antialiasing)
             self.painter2.setOpacity(0.7)
         # dont allow alignment messing with footers
         if footer:
@@ -458,7 +458,7 @@ class Renderer(object):
                 x = maxx - w
             # centre
             elif align == 2:
-                x = (maxx - w) / 2;
+                x = (maxx - w) / 2
                 rightextent = x + w
             if live:
                 # now draw the text, and any outlines/shadows

openlp/core/lib/themexmlhandler.py

@@ -171,7 +171,8 @@ class ThemeXML(object):
         self.child_element(background, u'filename', filename)
 
     def add_font(self, name, color, proportion, override, fonttype=u'main',
-        weight=u'Normal', italics=u'False', indentation=0, xpos=0, ypos=0, width=0, height=0):
+        weight=u'Normal', italics=u'False', indentation=0, xpos=0, ypos=0,
+        width=0, height=0):
         """
         Add a Font.
 
@@ -363,14 +364,14 @@ class ThemeXML(object):
         master = u''
         for element in iter:
             element.text = unicode(element.text).decode('unicode-escape')
-            if len(element.getchildren()) > 0:
+            if element.getchildren():
                 master = element.tag + u'_'
             else:
                 #background transparent tags have no children so special case
                 if element.tag == u'background':
                     for e in element.attrib.iteritems():
                         setattr(self, element.tag + u'_' + e[0], e[1])
-            if len(element.attrib) > 0:
+            if element.attrib:
                 for e in element.attrib.iteritems():
                     if master == u'font_' and e[0] == u'type':
                         master += e[1] + u'_'

openlp/core/ui/maindisplay.py

@@ -65,7 +65,7 @@ class DisplayWidget(QtGui.QWidget):
                 Receiver.send_message(u'live_slidecontroller_last')
                 event.accept()
             elif event.key() in self.hotkey_map:
-                Receiver.send_message(self.hotkey_map[event.key()]);
+                Receiver.send_message(self.hotkey_map[event.key()])
                 event.accept()
             elif event.key() == QtCore.Qt.Key_Escape:
                 self.resetDisplay()

openlp/core/ui/screen.py

@@ -40,7 +40,7 @@ class ScreenList(object):
         self.current_display = 0
 
     def add_screen(self, screen):
-        if screen[u'primary'] == True:
+        if screen[u'primary']:
             self.current = screen
         self.screen_list.append(screen)
         self.count += 1
@@ -70,4 +70,3 @@ class ScreenList(object):
 #                if scrn[u'number'] == screenNumber:
 #                    self.screen = scrn
 #                    break
-

openlp/core/ui/servicemanager.py

@@ -33,8 +33,7 @@ log = logging.getLogger(__name__)
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import PluginConfig, OpenLPToolbar, ServiceItem, \
-    contextMenuAction, contextMenuSeparator, contextMenu, Receiver, \
+    contextMenuAction, Receiver, str_to_bool, build_icon
-    contextMenu, str_to_bool, build_icon
 from openlp.core.ui import ServiceItemNoteForm
 
 class ServiceManagerList(QtGui.QTreeWidget):
@@ -433,7 +432,7 @@ class ServiceManager(QtGui.QWidget):
         for itemcount, item in enumerate(self.serviceItems):
             serviceitem = item[u'service_item']
             treewidgetitem = QtGui.QTreeWidgetItem(self.ServiceManagerList)
-            if len(serviceitem.notes) > 0:
+            if serviceitem.notes:
                 icon = QtGui.QImage(serviceitem.icon)
                 icon = icon.scaled(80, 80, QtCore.Qt.KeepAspectRatio,
                                     QtCore.Qt.SmoothTransformation)
@@ -608,7 +607,7 @@ class ServiceManager(QtGui.QWidget):
     def regenerateServiceItems(self):
         #force reset of renderer as theme data has changed
         self.parent.RenderManager.themedata = None
-        if len(self.serviceItems) > 0:
+        if self.serviceItems:
             tempServiceItems = self.serviceItems
             self.ServiceManagerList.clear()
             self.serviceItems = []
@@ -670,7 +669,7 @@ class ServiceManager(QtGui.QWidget):
         if str_to_bool(PluginConfig(u'General').
                         get_config(u'auto preview', u'False')):
             item += 1
-            if len(self.serviceItems) > 0 and item < len(self.serviceItems) and \
+            if self.serviceItems and item < len(self.serviceItems) and \
                 self.serviceItems[item][u'service_item'].autoPreviewAllowed:
                     self.parent.PreviewController.addServiceManagerItem(
                         self.serviceItems[item][u'service_item'], 0)
@@ -732,7 +731,7 @@ class ServiceManager(QtGui.QWidget):
             if plugin == u'ServiceManager':
                 startpos,  startCount = self.findServiceItem()
                 item = self.ServiceManagerList.itemAt(event.pos())
-                if item == None:
+                if item is None:
                     endpos = len(self.serviceItems)
                 else:
                     parentitem = item.parent()

openlp/core/ui/slidecontroller.py

@@ -65,7 +65,7 @@ class SlideList(QtGui.QTableWidget):
                 self.parent.onSlideSelectedLast()
                 event.accept()
             elif event.key() in self.hotkey_map and self.parent.isLive:
-                Receiver.send_message(self.hotkey_map[event.key()]);
+                Receiver.send_message(self.hotkey_map[event.key()])
                 event.accept()
             event.ignore()
         else:

openlp/core/ui/thememanager.py

@@ -246,7 +246,7 @@ class ThemeManager(QtGui.QWidget):
             self, self.trUtf8('Select Theme Import File'),
             self.config.get_last_dir(), u'Theme (*.*)')
         log.info(u'New Themes %s', unicode(files))
-        if len(files) > 0:
+        if files:
             for file in files:
                 self.config.set_last_dir(unicode(file))
                 self.unzipTheme(file, self.path)

openlp/migration/display.py

@@ -32,11 +32,11 @@ class Display():
 
     @staticmethod
     def output(string):
-        log.debug(string);
+        log.debug(string)
-        print (string)
+        #print (string)
 
     @staticmethod
     def sub_output(string):
         if not string is None:
-            log.debug(u'   '+string);
+            log.debug(u'   '+string)
-            print (u'   '+string)
+            #print (u'   '+string)

openlp/migration/migratebibles.py

@@ -28,5 +28,5 @@ class MigrateBibles():
         self.display = display
 
     def process(self):
-        self.display.output(u'Bible process started');
+        self.display.output(u'Bible process started')
-        self.display.output(u'Bible process finished');
+        self.display.output(u'Bible process finished')

openlp/migration/migratefiles.py

@@ -30,20 +30,20 @@ class MigrateFiles():
         self.display = display
 
     def process(self):
-        self.display.output(u'Files process started');
+        self.display.output(u'Files process started')
         self._initial_setup()
-        self.display.output(u'Files process finished');
+        self.display.output(u'Files process finished')
 
     def _initial_setup(self):
-        self.display.output(u'Initial Setup started');
+        self.display.output(u'Initial Setup started')
         ConfigHelper.get_data_path()
-        self.display.sub_output(u'Config created');
+        self.display.sub_output(u'Config created')
         ConfigHelper.get_config(u'bible', u'data path')
-        self.display.sub_output(u'Config created');
+        self.display.sub_output(u'Config created')
         ConfigHelper.get_config(u'videos', u'data path')
-        self.display.sub_output(u'videos created');
+        self.display.sub_output(u'videos created')
         ConfigHelper.get_config(u'images', u'data path')
-        self.display.sub_output(u'images created');
+        self.display.sub_output(u'images created')
         ConfigHelper.get_config(u'presentations', u'data path')
-        self.display.sub_output(u'presentations created');
+        self.display.sub_output(u'presentations created')
-        self.display.output(u'Initial Setup finished');
+        self.display.output(u'Initial Setup finished')

openlp/plugins/alerts/forms/alerteditform.py

@@ -82,7 +82,7 @@ class AlertEditForm(QtGui.QDialog, Ui_AlertEditDialog):
         self.DeleteButton.setEnabled(False)
 
     def onItemSelected(self):
-        if len(self.AlertLineEdit.text()) > 0:
+        if self.AlertLineEdit.text():
             QtGui.QMessageBox.information(self,
                 self.trUtf8('Item selected to Edit'),
                 self.trUtf8('Please Save or Clear seletced item'))

openlp/plugins/bibles/lib/http.py

@@ -77,7 +77,7 @@ class HTTPBooks(object):
         books = HTTPBooks.run_sql(u'SELECT id, testament_id, name, '
                 u'abbreviation, chapters FROM books WHERE name = ? OR '
                 u'abbreviation = ?', (name, name))
-        if len(books) > 0:
+        if books:
             return {
                 u'id': books[0][0],
                 u'testament_id': books[0][1],
@@ -95,7 +95,7 @@ class HTTPBooks(object):
         book = HTTPBooks.get_book(name)
         chapters = HTTPBooks.run_sql(u'SELECT id, book_id, chapter, '
             u'verses FROM chapters WHERE book_id = ?', (book[u'id'],))
-        if len(chapters) > 0:
+        if chapters:
             return {
                 u'id': chapters[0][0],
                 u'book_id': chapters[0][1],

openlp/plugins/custom/forms/editcustomform.py

@@ -254,7 +254,7 @@ class EditCustomForm(QtGui.QDialog, Ui_customEditDialog):
         if self.VerseListView.count() == 0:
             self.VerseTextEdit.setFocus()
             return False, self.trUtf8('You need to enter a slide')
-        if len(self.VerseTextEdit.toPlainText()) > 0:
+        if self.VerseTextEdit.toPlainText():
             self.VerseTextEdit.setFocus()
             return False, self.trUtf8('You have unsaved data')
         return True,  u''

openlp/plugins/custom/lib/mediaitem.py

@@ -151,7 +151,7 @@ class CustomMediaItem(MediaManagerItem):
         service_item.edit_enabled = True
         service_item.editId = item_id
         theme = customSlide.theme_name
-        if len(theme) is not 0 :
+        if theme:
             service_item.theme = theme
         songXML = SongXMLParser(customSlide.text)
         verseList = songXML.get_verses()
@@ -160,8 +160,8 @@ class CustomMediaItem(MediaManagerItem):
         service_item.title = title
         for slide in raw_slides:
             service_item.add_from_text(slide[:30], slide)
-        if str_to_bool(self.parent.config.get_config(u'display footer', True)) or \
+        if str_to_bool(self.parent.config.get_config(u'display footer', True)) \
-            len(credit) > 0:
+            or credit:
             raw_footer.append(title + u' ' + credit)
         else:
             raw_footer.append(u'')

openlp/plugins/presentations/lib/powerpointcontroller.py

@@ -167,7 +167,7 @@ class PowerpointDocument(PresentationDocument):
         Triggerent by new object being added to SlideController orOpenLP
         being shut down
         """
-        if self.presentation == None:
+        if self.presentation is None:
             return
         try:
             self.presentation.Close()
@@ -183,9 +183,9 @@ class PowerpointDocument(PresentationDocument):
         if not self.controller.is_loaded():
             return False
         try:
-            if self.presentation.SlideShowWindow == None:
+            if self.presentation.SlideShowWindow is None:
                 return False
-            if self.presentation.SlideShowWindow.View == None:
+            if self.presentation.SlideShowWindow.View is None:
                 return False
         except:
             return False

openlp/plugins/presentations/lib/pptviewcontroller.py

@@ -122,7 +122,7 @@ class PptviewDocument(PresentationDocument):
         rendermanager = self.controller.plugin.render_manager
         rect = rendermanager.screens.current[u'size']
         rect = RECT(rect.x(), rect.y(), rect.right(), rect.bottom())
-        filepath = str(self.filepath.replace(u'/', u'\\'));
+        filepath = str(self.filepath.replace(u'/', u'\\'))
         try:
             self.pptid = self.controller.process.OpenPPT(filepath, None, rect,
                 str(os.path.join(self.thumbnailpath, self.controller.thumbnailprefix)))

openlp/plugins/presentations/presentationplugin.py

@@ -103,7 +103,7 @@ class PresentationPlugin(Plugin):
             self.registerControllers(controller)
             if controller.enabled:
                 controller.start_process()
-        if len(self.controllers) > 0:
+        if self.controllers:
             return True
         else:
             return False

openlp/plugins/remotes/remoteclient.py

@@ -54,7 +54,7 @@ def main():
                       help="Message to be passed for the action")
 
     (options, args) = parser.parse_args()
-    if len(args) > 0:
+    if args:
         parser.print_help()
         parser.error("incorrect number of arguments")
     elif options.address is None:

openlp/plugins/songs/forms/songmaintenancedialog.py

@@ -51,10 +51,10 @@ class Ui_SongMaintenanceDialog(object):
             self.TypeListWidget.sizePolicy().hasHeightForWidth())
         self.TypeListWidget.setSizePolicy(sizePolicy)
         self.TypeListWidget.setViewMode(QtGui.QListView.IconMode)
-        self.TypeListWidget.setIconSize(QtCore.QSize(112, 100));
+        self.TypeListWidget.setIconSize(QtCore.QSize(112, 100))
-        self.TypeListWidget.setMovement(QtGui.QListView.Static);
+        self.TypeListWidget.setMovement(QtGui.QListView.Static)
-        self.TypeListWidget.setMaximumWidth(118);
+        self.TypeListWidget.setMaximumWidth(118)
-        self.TypeListWidget.setSpacing(0);
+        self.TypeListWidget.setSpacing(0)
         self.TypeListWidget.setSortingEnabled(False)
         self.TypeListWidget.setUniformItemSizes(True)
         self.TypeListWidget.setObjectName(u'TypeListWidget')

openlp/plugins/songs/lib/songxml.py

@@ -153,12 +153,12 @@ class _OpenSong(XmlRootClass):
         tmpVerse = []
         finalLyrics = []
         tag = ""
-        for l in lyrics:
+        for lyric in lyrics:
-            line = l.rstrip()
+            line = lyric.rstrip()
             if not line.startswith(u'.'):
                 # drop all chords
                 tmpVerse.append(line)
-                if len(line) > 0:
+                if line:
                     if line.startswith(u'['):
                         tag = line
                 else:
@@ -298,9 +298,9 @@ class Song(object):
         chars are: .,:;!?&%#/\@`$'|"^~*-
         """
         punctuation = ".,:;!?&%#'\"/\\@`$|^~*-"
-        s = title
+        string = title
-        for c in punctuation:
+        for char in punctuation:
-            s = s.replace(c, '')
+            string = string.replace(char, '')
         return s
 
     def set_title(self, title):
@@ -582,17 +582,16 @@ class Song(object):
         self.slideList = []
         tmpSlide = []
         metContent = False
-        for l in self.lyrics:
+        for lyric in self.lyrics:
-            if len(l) > 0:
+            if lyric:
                 metContent = True
-                tmpSlide.append(l)
+                tmpSlide.append(lyric)
             else:
                 if metContent:
                     metContent = False
                     self.slideList.append(tmpSlide)
                     tmpSlide = []
-        #
+        if tmpSlide:
-        if len(tmpSlide) > 0:
             self.slideList.append(tmpSlide)
 
     def get_number_of_slides(self):

setup.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
 from setuptools import setup, find_packages
-import sys, os
 
 VERSION_FILE = 'openlp/.version'