From d2d55531e6176484ccf10e1a46a427ef9dbf65db Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Sun, 27 Aug 2017 22:24:18 -0400
Subject: [PATCH] Remove double-registration of proxy factory.

Due to a bad merge, proxy.init() was called twice.
---
 qutebrowser/browser/browsertab.py       | 3 ---
 qutebrowser/browser/webkit/webkittab.py | 9 ---------
 2 files changed, 12 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 6183474a4..60b5b3b31 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -61,9 +61,6 @@ def init():
     if objects.backend == usertypes.Backend.QtWebEngine:
         from qutebrowser.browser.webengine import webenginetab
         webenginetab.init()
-    else:
-        from qutebrowser.browser.webkit import webkittab
-        webkittab.init()
 
 
 class WebTabError(Exception):
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index cd040e5d2..b81599e8a 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -33,18 +33,9 @@ from PyQt5.QtPrintSupport import QPrinter
 
 from qutebrowser.browser import browsertab
 from qutebrowser.browser.webkit import webview, tabhistory, webkitelem
-from qutebrowser.browser.network import proxy
 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):
 
     """QtWebKit implementations related to web actions."""