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

Pep fixes

Browse Source
This commit is contained in:
Philip Ridout 2017-10-01 00:06:30 +01:00
parent 76bbc4500a
commit c5a6fd9e31
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/plugins/songs/lib/importers/openoffice.py
View File

@ -152,7 +152,7 @@ class OpenOfficeImport(SongImport):
self.document.supportsService("com.sun.star.text.TextDocument"): self.document.supportsService("com.sun.star.text.TextDocument"):
self.close_ooo_file() self.close_ooo_file()
else: else:
self.import_wizard.increment_progress_bar('Processing file {file_path}'.format(file_path), 0) self.import_wizard.increment_progress_bar('Processing file {file_path}'.format(file_path=file_path), 0)
except AttributeError: except AttributeError:
log.exception("open_ooo_file failed: {url}".format(url=url)) log.exception("open_ooo_file failed: {url}".format(url=url))
return return

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

@ -22,13 +22,11 @@
import logging import logging
import re import re
import shutil
import os
from PyQt5 import QtCore from PyQt5 import QtCore
from openlp.core.common import Registry, AppLocation, check_directory_exists, translate from openlp.core.common import Registry, AppLocation, check_directory_exists, translate
from openlp.core.common.path import Path from openlp.core.common.path import copyfile
from openlp.core.ui.lib.wizard import WizardStrings from openlp.core.ui.lib.wizard import WizardStrings
from openlp.plugins.songs.lib import clean_song, VerseType from openlp.plugins.songs.lib import clean_song, VerseType
from openlp.plugins.songs.lib.db import Song, Author, Topic, Book, MediaFile from openlp.plugins.songs.lib.db import Song, Author, Topic, Book, MediaFile