From 07468f0093d587c4b31f7e7e7419a460be8d1c8f Mon Sep 17 00:00:00 2001
From: Ken Roberts <alisonken1@gmail.com>
Date: Sun, 15 May 2016 10:32:04 -0700
Subject: [PATCH] Fix oops

---
 openlp/core/common/actions.py                        | 6 +++---
 openlp/core/common/settings.py                       | 2 +-
 tests/functional/openlp_core_lib/test_projectordb.py | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/openlp/core/common/actions.py b/openlp/core/common/actions.py
index 7f8c90f86..d22ef8fd1 100644
--- a/openlp/core/common/actions.py
+++ b/openlp/core/common/actions.py
@@ -284,9 +284,9 @@ class ActionList(object):
             actions.append(action)
             ActionList.shortcut_map[shortcuts[0]] = actions
         else:
-            log.warning('Shortcut "{shortcut}" is removed from "{action}" ''
-                        because another action already uses this shortcut.'.format(shortcut=shortcuts[0],
-                                                                                   action=action.objectName()))
+            log.warning('Shortcut "{shortcut}" is removed from "{action}" '
+                        'because another action already uses this shortcut.'.format(shortcut=shortcuts[0],
+                                                                                    action=action.objectName()))
             shortcuts.remove(shortcuts[0])
         action.setShortcuts([QtGui.QKeySequence(shortcut) for shortcut in shortcuts])
 
diff --git a/openlp/core/common/settings.py b/openlp/core/common/settings.py
index 07449ff64..7bbd4349d 100644
--- a/openlp/core/common/settings.py
+++ b/openlp/core/common/settings.py
@@ -496,7 +496,7 @@ class Settings(QtCore.QSettings):
                     item = settings.value('{name} {counter:d}'.format(name=plugin.name, counter=counter), '')
                     if item:
                         files_list.append(item)
-                    settings.remove('{name} {counter:d}'.format=(plugin.name, counter))
+                    settings.remove('{name} {counter:d}'.format(name=plugin.name, counter=counter))
             settings.remove('{name} count'.format(name=plugin.name))
         settings.endGroup()
         return files_list
diff --git a/tests/functional/openlp_core_lib/test_projectordb.py b/tests/functional/openlp_core_lib/test_projectordb.py
index 158cb5fb6..c1b9ce3d1 100644
--- a/tests/functional/openlp_core_lib/test_projectordb.py
+++ b/tests/functional/openlp_core_lib/test_projectordb.py
@@ -218,5 +218,5 @@ class TestProjectorDB(TestCase):
         model.name = 'OpenLP Test'
 
         # THEN: __repr__ should return a proper string
-        self.assertEqual(str(model), '<Model(name="OpenLP Test")>',
+        self.assertEqual(str(model), '<Model(name='"OpenLP Test"')>',
                          'Model.__repr__() should have returned a proper representation string')