rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sessions: Logging/error message improvements.

Browse Source
This commit is contained in:
Florian Bruhin 2015-08-24 17:03:23 +02:00
parent f79e2c92a4
commit 201f2f67d3
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
qutebrowser/misc/sessions.py
View File

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