openlp-core team mailing list archive

[Meinert Jordan <meinertjordan@xxxxxxxxxx>]

Meinert Jordan has proposed merging lp:~m2j/openlp/bug-910860 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~m2j/openlp/bug-910860/+merge/90575

Bug #910860: Strip spaces from author name on CCLI import
-- 
https://code.launchpad.net/~m2j/openlp/bug-910860/+merge/90575
Your team OpenLP Core is requested to review the proposed merge of lp:~m2j/openlp/bug-910860 into lp:openlp.

=== modified file 'openlp/plugins/songs/lib/cclifileimport.py'
--- openlp/plugins/songs/lib/cclifileimport.py	2011-12-27 10:33:55 +0000
+++ openlp/plugins/songs/lib/cclifileimport.py	2012-01-28 15:17:24 +0000
@@ -216,9 +216,9 @@
         for author in author_list:
             separated = author.split(u',')
             if len(separated) > 1:
-                self.addAuthor(u' '.join(reversed(separated)))
-            else:
-                self.addAuthor(author)
+                author = u' '.join(
+                    [name.strip() for name in reversed(separated)])
+            self.addAuthor(author.strip())
         self.topics = [topic.strip() for topic in song_topics.split(u'/t')]
         return self.finish()