raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Add the recover back in, we need it.

Browse Source
This commit is contained in:
Raoul Snyman 2019-03-26 22:57:15 -07:00
parent bddc3f02dc
commit 20f0464221
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/plugins/songs/lib/importers/presentationmanager.py
View File

@ -45,7 +45,7 @@ class PresentationManagerImport(SongImport):
return return
self.import_wizard.increment_progress_bar(WizardStrings.ImportingType.format(source=file_path.name)) self.import_wizard.increment_progress_bar(WizardStrings.ImportingType.format(source=file_path.name))
try: try:
tree = etree.parse(str(file_path), parser=etree.XMLParser()) tree = etree.parse(str(file_path), parser=etree.XMLParser(recover=True))
except etree.XMLSyntaxError: except etree.XMLSyntaxError:
# Try to detect encoding and use it # Try to detect encoding and use it
encoding = get_file_encoding(file_path)['encoding'] encoding = get_file_encoding(file_path)['encoding']
@ -53,7 +53,7 @@ class PresentationManagerImport(SongImport):
text = file_path.read_text(encoding=encoding) text = file_path.read_text(encoding=encoding)
text = re.sub(r'.+\?>\n', '', text) text = re.sub(r'.+\?>\n', '', text)
try: try:
tree = etree.fromstring(text, parser=etree.XMLParser()) tree = etree.fromstring(text, parser=etree.XMLParser(recover=True))
except ValueError: except ValueError:
self.log_error(file_path, self.log_error(file_path,
translate('SongsPlugin.PresentationManagerImport', translate('SongsPlugin.PresentationManagerImport',