← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~mahfiaz/openlp/csv_bible into lp:openlp

 

mahfiaz has proposed merging lp:~mahfiaz/openlp/csv_bible into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~mahfiaz/openlp/csv_bible/+merge/86471

Fix a warning which was created by previous fix.
-- 
https://code.launchpad.net/~mahfiaz/openlp/csv_bible/+merge/86471
Your team OpenLP Core is requested to review the proposed merge of lp:~mahfiaz/openlp/csv_bible into lp:openlp.
=== modified file 'openlp/plugins/songs/lib/cclifileimport.py'
--- openlp/plugins/songs/lib/cclifileimport.py	2011-12-10 18:21:18 +0000
+++ openlp/plugins/songs/lib/cclifileimport.py	2011-12-20 22:17:26 +0000
@@ -75,7 +75,7 @@
                     details = chardet.detect(detect_content)
                 detect_file.close()
                 infile = codecs.open(filename, u'r', details['encoding'])
-                if not infile.read(3) == '\xEF\xBB\xBF':
+                if not infile.read(1) == u'\ufeff':
                     # not UTF or no BOM was found
                     infile.seek(0)
                 lines = infile.readlines()


Follow ups