From 201f2f67d351f4d504d13e7db89b83f25ea8abc7 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 24 Aug 2015 17:03:23 +0200
Subject: [PATCH] sessions: Logging/error message improvements.

---
 qutebrowser/misc/sessions.py | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index 6f4182905..2dc5f8c09 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -351,8 +351,8 @@ class SessionManager(QObject):
                    underline).
         """
         if name.startswith('_') and not force:
-            raise cmdexc.CommandError("{!r} is an internal session, use "
-                                      "--force to load anyways.".format(name))
+            raise cmdexc.CommandError("{} is an internal session, use --force "
+                                      "to load anyways.".format(name))
         old_windows = list(objreg.window_registry.values())
         try:
             self.load(name, temp=temp)
@@ -384,8 +384,8 @@ class SessionManager(QObject):
         if (name is not default and
                 name.startswith('_') and  # pylint: disable=no-member
                 not force):
-            raise cmdexc.CommandError("{!r} is an internal session, use "
-                                      "--force to save anyways.".format(name))
+            raise cmdexc.CommandError("{} is an internal session, use --force "
+                                      "to save anyways.".format(name))
         if current:
             if self._current is None:
                 raise cmdexc.CommandError("No session loaded currently!")
@@ -398,7 +398,7 @@ class SessionManager(QObject):
                                       .format(e))
         else:
             if not quiet:
-                message.info(win_id, "Saved session {!r}.".format(name),
+                message.info(win_id, "Saved session {}.".format(name),
                              immediately=True)
 
     @cmdutils.register(completion=[usertypes.Completion.sessions],
@@ -412,14 +412,12 @@ class SessionManager(QObject):
                    underline).
         """
         if name.startswith('_') and not force:
-            raise cmdexc.CommandError("{!r} is an internal session, use "
-                                      "--force to delete anyways.".format(
-                                          name))
+            raise cmdexc.CommandError("{} is an internal session, use --force "
+                                      "to delete anyways.".format(name))
         try:
             self.delete(name)
-        except SessionNotFoundError as e:
-            log.sessions.exception("Session not found!")
-            raise cmdexc.CommandError("Session {} not found".format(e))
+        except SessionNotFoundError:
+            raise cmdexc.CommandError("Session {} not found!".format(name))
         except (OSError, SessionError) as e:
             log.sessions.exception("Error while deleting session!")
             raise cmdexc.CommandError("Error while deleting session: {}"