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

Revert "Break up circular import on Python 3.4"

Browse Source 
This reverts commit e5be48fcc0.
There are other circular imports as well.
This commit is contained in:
Florian Bruhin 2016-04-26 22:14:59 +02:00
parent e5be48fcc0
commit 59c4cdd1c2
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qutebrowser/misc/sessions.py
View File

@ -35,6 +35,7 @@ from qutebrowser.browser import tabhistory
from qutebrowser.utils import (standarddir, objreg, qtutils, log, usertypes, from qutebrowser.utils import (standarddir, objreg, qtutils, log, usertypes,
message) message)
from qutebrowser.commands import cmdexc, cmdutils from qutebrowser.commands import cmdexc, cmdutils
from qutebrowser.mainwindow import mainwindow
from qutebrowser.config import config from qutebrowser.config import config
@ -312,8 +313,6 @@ class SessionManager(QObject):
name: The name of the session to load. name: The name of the session to load.
temp: If given, don't set the current session. temp: If given, don't set the current session.
""" """
# To break up partial import
from qutebrowser.mainwindow import mainwindow
path = self._get_session_path(name, check_exists=True) path = self._get_session_path(name, check_exists=True)
try: try:
with open(path, encoding='utf-8') as f: with open(path, encoding='utf-8') as f: