openlp-core team mailing list archive

[mahfiaz <mahfiaz@xxxxxxxxx>]

mahfiaz has proposed merging lp:~mahfiaz/openlp/bug-304 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~mahfiaz/openlp/bug-304/+merge/85787

In OpenLyrics importer catches AttributeError as well under XML syntax error message. I wonder if this is okay, could we say that missing attribute is also a XML syntax problem?
-- 
https://code.launchpad.net/~mahfiaz/openlp/bug-304/+merge/85787
Your team OpenLP Core is requested to review the proposed merge of lp:~mahfiaz/openlp/bug-304 into lp:openlp.

=== modified file 'openlp/plugins/songs/lib/openlyricsimport.py'
--- openlp/plugins/songs/lib/openlyricsimport.py	2011-09-05 12:51:16 +0000
+++ openlp/plugins/songs/lib/openlyricsimport.py	2011-12-15 03:55:27 +0000
@@ -70,6 +70,6 @@
                 parsed_file = etree.parse(open(file_path, u'r'), parser)
                 xml = unicode(etree.tostring(parsed_file))
                 self.openLyrics.xml_to_song(xml)
-            except etree.XMLSyntaxError:
+            except etree.XMLSyntaxError, AttributeError:
                 log.exception(u'XML syntax error in file %s' % file_path)
                 self.logError(file_path, SongStrings.XMLSyntaxError)