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

Remove double-registration of proxy factory.

Browse Source 
Due to a bad merge, proxy.init() was called twice.
This commit is contained in:
Ryan Roden-Corrent 2017-08-27 22:24:18 -04:00
parent 111846a909
commit d2d55531e6
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qutebrowser/browser/browsertab.py
View File

@ -61,9 +61,6 @@ def init():
if objects.backend == usertypes.Backend.QtWebEngine: if objects.backend == usertypes.Backend.QtWebEngine:
from qutebrowser.browser.webengine import webenginetab from qutebrowser.browser.webengine import webenginetab
webenginetab.init() webenginetab.init()
else:
from qutebrowser.browser.webkit import webkittab
webkittab.init()
class WebTabError(Exception): class WebTabError(Exception):

9
qutebrowser/browser/webkit/webkittab.py
View File

@ -33,18 +33,9 @@ from PyQt5.QtPrintSupport import QPrinter
from qutebrowser.browser import browsertab from qutebrowser.browser import browsertab
from qutebrowser.browser.webkit import webview, tabhistory, webkitelem from qutebrowser.browser.webkit import webview, tabhistory, webkitelem
from qutebrowser.browser.network import proxy
from qutebrowser.utils import qtutils, objreg, usertypes, utils, log, debug from qutebrowser.utils import qtutils, objreg, usertypes, utils, log, debug
def init():
"""Initialize QtWebKit-specific modules."""
if not qtutils.version_check('5.8'):
# Otherwise we initialize it globally in app.py
log.init.debug("Initializing proxy...")
proxy.init()
class WebKitAction(browsertab.AbstractAction): class WebKitAction(browsertab.AbstractAction):
"""QtWebKit implementations related to web actions.""" """QtWebKit implementations related to web actions."""