Move CommandError to api.cmdutils

1 files changed, 21 insertions, 19 deletions

diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index 459011e0f..4f80ad2b0 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -31,7 +31,7 @@ import yaml
 
 from qutebrowser.utils import (standarddir, objreg, qtutils, log, message,
                                utils)
-from qutebrowser.commands import cmdexc, cmdutils
+from qutebrowser.api import cmdutils
 from qutebrowser.config import config, configfiles
 from qutebrowser.completion.models import miscmodels
 from qutebrowser.mainwindow import mainwindow
@@ -480,16 +480,17 @@ class SessionManager(QObject):
             delete: Delete the saved session once it has loaded.
         """
         if name.startswith('_') and not force:
-            raise cmdexc.CommandError("{} is an internal session, use --force "
-                                      "to load anyways.".format(name))
+            raise cmdutils.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)
         except SessionNotFoundError:
-            raise cmdexc.CommandError("Session {} not found!".format(name))
+            raise cmdutils.CommandError("Session {} not found!".format(name))
         except SessionError as e:
-            raise cmdexc.CommandError("Error while loading session: {}"
-                                      .format(e))
+            raise cmdutils.CommandError("Error while loading session: {}"
+                                        .format(e))
         else:
             if clear:
                 for win in old_windows:
@@ -499,9 +500,8 @@ class SessionManager(QObject):
                     self.delete(name)
                 except SessionError as e:
                     log.sessions.exception("Error while deleting session!")
-                    raise cmdexc.CommandError(
-                        "Error while deleting session: {}"
-                        .format(e))
+                    raise cmdutils.CommandError("Error while deleting "
+                                                "session: {}".format(e))
                 else:
                     log.sessions.debug(
                         "Loaded & deleted session {}.".format(name))
@@ -531,11 +531,12 @@ class SessionManager(QObject):
         if (not isinstance(name, Sentinel) and
                 name.startswith('_') and
                 not force):
-            raise cmdexc.CommandError("{} is an internal session, use --force "
-                                      "to save anyways.".format(name))
+            raise cmdutils.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!")
+                raise cmdutils.CommandError("No session loaded currently!")
             name = self._current
             assert not name.startswith('_')
         try:
@@ -545,8 +546,8 @@ class SessionManager(QObject):
             else:
                 name = self.save(name, with_private=with_private)
         except SessionError as e:
-            raise cmdexc.CommandError("Error while saving session: {}"
-                                      .format(e))
+            raise cmdutils.CommandError("Error while saving session: {}"
+                                        .format(e))
         else:
             if quiet:
                 log.sessions.debug("Saved session {}.".format(name))
@@ -564,15 +565,16 @@ class SessionManager(QObject):
                    underline).
         """
         if name.startswith('_') and not force:
-            raise cmdexc.CommandError("{} is an internal session, use --force "
-                                      "to delete anyways.".format(name))
+            raise cmdutils.CommandError("{} is an internal session, use "
+                                        "--force to delete anyways."
+                                        .format(name))
         try:
             self.delete(name)
         except SessionNotFoundError:
-            raise cmdexc.CommandError("Session {} not found!".format(name))
+            raise cmdutils.CommandError("Session {} not found!".format(name))
         except SessionError as e:
             log.sessions.exception("Error while deleting session!")
-            raise cmdexc.CommandError("Error while deleting session: {}"
-                                      .format(e))
+            raise cmdutils.CommandError("Error while deleting session: {}"
+                                        .format(e))
         else:
             log.sessions.debug("Deleted session {}.".format(name))