Improved =s

openlp/plugins/songs/lib/opensongimport.py

@@ -124,7 +124,7 @@ class OpenSongImport:
             if semicolon >= 0:
                 l = l[:semicolon]
             l = l.strip()
-            if l==u'':
+            if len(l) == 0:
                 continue
             # skip inline guitar chords
             if l[0] == u'.':
@@ -189,7 +189,7 @@ class OpenSongImport:
         for tag in order:
             if not versetags.has_key(tag):
                 print u'Got order', tag, u'but not in versetags, skipping'
-                raise OpenSongImportError
+                raise OpenSongImportError # xxx keep error, or just warn?
             else:
                 self.song.verse_order_list.append(tag)
     def finish(self):

openlp/plugins/songs/lib/test_opensongimport.py

@@ -1,4 +1,27 @@
 # -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2010 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
 from openlp.plugins.songs.lib.opensongimport import OpenSongImport
 from openlp.plugins.songs.lib.manager import SongManager