From d83da987aec210be0f2b761aa35bb0bfa1294e28 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 5 Apr 2015 23:44:25 +0200 Subject: [PATCH] Move SessionManager init to sessions.py. --- qutebrowser/app.py | 3 +-- qutebrowser/misc/sessions.py | 10 ++++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/qutebrowser/app.py b/qutebrowser/app.py index ffaaa79af..1278dbc76 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -187,8 +187,7 @@ class Application(QApplication): log.init.debug("Initializing crashlog...") self._handle_segfault() log.init.debug("Initializing sessions...") - session_manager = sessions.SessionManager(self) - objreg.register('session-manager', session_manager) + sessions.init(self) log.init.debug("Initializing js-bridge...") js_bridge = qutescheme.JSBridge(self) objreg.register('js-bridge', js_bridge) diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py index 96fbdf9e4..aeddea948 100644 --- a/qutebrowser/misc/sessions.py +++ b/qutebrowser/misc/sessions.py @@ -41,6 +41,16 @@ from qutebrowser.config import config default = object() # Sentinel value +def init(parent=None): + """Initialize sessions. + + Args: + parent: The parent to use for the SessionManager. + """ + session_manager = SessionManager(parent) + objreg.register('session-manager', session_manager) + + class SessionError(Exception): """Exception raised when a session failed to load/save."""