openlp-core team mailing list archive

[Jon Tibble <meths@xxxxxxxxxxxxxx>]

Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


v2 import bug fix (didn't have broken database to test but looks sane)

Various cleanups
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/42899
Your team OpenLP Core is requested to review the proposed merge of lp:~meths/openlp/trivialfixes into lp:openlp.

=== modified file 'openlp/core/lib/__init__.py'
--- openlp/core/lib/__init__.py	2010-11-27 21:12:52 +0000
+++ openlp/core/lib/__init__.py	2010-12-07 00:37:54 +0000
@@ -306,8 +306,8 @@
         text = text.replace(tag[u'end tag'], tag[u'end html'])
     return text
 
-from theme import ThemeLevel, ThemeXML, BackgroundGradientType, BackgroundType, \
-    HorizontalType, VerticalType
+from theme import ThemeLevel, ThemeXML, BackgroundGradientType, \
+    BackgroundType, HorizontalType, VerticalType
 from spelltextedit import SpellTextEdit
 from eventreceiver import Receiver
 from imagemanager import ImageManager

=== modified file 'openlp/core/lib/theme.py'
--- openlp/core/lib/theme.py	2010-12-03 20:22:59 +0000
+++ openlp/core/lib/theme.py	2010-12-07 00:37:54 +0000
@@ -31,7 +31,6 @@
 import logging
 
 from xml.dom.minidom import Document
-from xml.etree.ElementTree import ElementTree, XML
 from lxml import etree, objectify
 
 from openlp.core.lib import str_to_bool

=== modified file 'openlp/core/ui/advancedtab.py'
--- openlp/core/ui/advancedtab.py	2010-11-26 09:49:06 +0000
+++ openlp/core/ui/advancedtab.py	2010-12-07 00:37:54 +0000
@@ -82,7 +82,8 @@
         self.doubleClickLiveCheckBox.setObjectName(u'doubleClickLiveCheckBox')
         self.uiLayout.addWidget(self.doubleClickLiveCheckBox)
 #        self.expandServiceItemCheckBox = QtGui.QCheckBox(self.uiGroupBox)
-#        self.expandServiceItemCheckBox.setObjectName(u'expandServiceItemCheckBox')
+#        self.expandServiceItemCheckBox.setObjectName(
+#            u'expandServiceItemCheckBox')
 #        self.uiLayout.addWidget(self.expandServiceItemCheckBox)
         self.leftLayout.addWidget(self.uiGroupBox)
         self.expandServiceItemCheckBox = QtGui.QCheckBox(self.uiGroupBox)

=== modified file 'openlp/core/ui/themeform.py'
--- openlp/core/ui/themeform.py	2010-12-05 18:02:36 +0000
+++ openlp/core/ui/themeform.py	2010-12-07 00:37:54 +0000
@@ -624,5 +624,5 @@
         new_color = QtGui.QColorDialog.getColor(
             QtGui.QColor(field), self)
         if new_color.isValid():
-           field = new_color.name()
+            field = new_color.name()
         return field

=== modified file 'openlp/plugins/custom/lib/customxmlhandler.py'
--- openlp/plugins/custom/lib/customxmlhandler.py	2010-11-29 14:04:37 +0000
+++ openlp/plugins/custom/lib/customxmlhandler.py	2010-12-07 00:37:54 +0000
@@ -42,9 +42,8 @@
 import logging
 
 from xml.dom.minidom import Document
-from xml.etree.ElementTree import ElementTree, XML, dump
+from xml.etree.ElementTree import dump
 from lxml import etree, objectify
-from xml.parsers.expat import ExpatError
 
 log = logging.getLogger(__name__)
 

=== modified file 'openlp/plugins/songs/lib/olpimport.py'
--- openlp/plugins/songs/lib/olpimport.py	2010-09-14 18:18:47 +0000
+++ openlp/plugins/songs/lib/olpimport.py	2010-12-07 00:37:54 +0000
@@ -152,7 +152,7 @@
                 u'Importing song %s of %s' % (song_count, song_total))
             new_song = Song()
             new_song.title = song.title
-            if has_media_files:
+            if has_media_files and hasattr(song, 'alternate_title'):
                 new_song.alternate_title = song.alternate_title
             else:
                 old_titles = song.search_title.split(u'@')