diff --git a/openlp/plugins/songs/lib/importers/openoffice.py b/openlp/plugins/songs/lib/importers/openoffice.py index cbfbf8626..f03f7b4a4 100644 --- a/openlp/plugins/songs/lib/importers/openoffice.py +++ b/openlp/plugins/songs/lib/importers/openoffice.py @@ -152,7 +152,7 @@ class OpenOfficeImport(SongImport): self.document.supportsService("com.sun.star.text.TextDocument"): self.close_ooo_file() 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: log.exception("open_ooo_file failed: {url}".format(url=url)) return diff --git a/openlp/plugins/songs/lib/importers/songimport.py b/openlp/plugins/songs/lib/importers/songimport.py index 33689525f..a74aaf9e7 100644 --- a/openlp/plugins/songs/lib/importers/songimport.py +++ b/openlp/plugins/songs/lib/importers/songimport.py @@ -22,13 +22,11 @@ import logging import re -import shutil -import os from PyQt5 import QtCore 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.plugins.songs.lib import clean_song, VerseType from openlp.plugins.songs.lib.db import Song, Author, Topic, Book, MediaFile