Move proxy/pac out of QtWebKit folder

qutebrowser/browser/network/proxy.py

@@ -24,7 +24,7 @@ from PyQt5.QtNetwork import QNetworkProxy, QNetworkProxyFactory
 
 from qutebrowser.config import config, configtypes
 from qutebrowser.utils import objreg
-from qutebrowser.browser.webkit.network import pac
+from qutebrowser.browser.network import pac
 
 
 def init():

qutebrowser/browser/webkit/webkittab.py

@@ -32,8 +32,9 @@ from PyQt5.QtWebKit import QWebSettings
 from PyQt5.QtPrintSupport import QPrinter
 
 from qutebrowser.browser import browsertab
+from qutebrowser.browser.network import proxy
 from qutebrowser.browser.webkit import webview, tabhistory, webkitelem
-from qutebrowser.browser.webkit.network import proxy, webkitqutescheme
+from qutebrowser.browser.webkit.network import webkitqutescheme
 from qutebrowser.utils import qtutils, objreg, usertypes, utils, log
 
 

qutebrowser/utils/urlutils.py

@@ -32,7 +32,7 @@ from PyQt5.QtNetwork import QHostInfo, QHostAddress, QNetworkProxy
 from qutebrowser.config import config, configexc
 from qutebrowser.utils import log, qtutils, message, utils
 from qutebrowser.commands import cmdexc
-from qutebrowser.browser.webkit.network import pac
+from qutebrowser.browser.network import pac
 
 
 # FIXME: we probably could raise some exceptions on invalid URLs

tests/unit/browser/webkit/network/test_pac.py

@@ -27,7 +27,7 @@ from PyQt5.QtCore import QUrl, QT_VERSION_STR
 from PyQt5.QtNetwork import (QNetworkProxy, QNetworkProxyQuery, QHostInfo,
                              QHostAddress)
 
-from qutebrowser.browser.webkit.network import pac
+from qutebrowser.browser.network import pac
 
 
 pytestmark = pytest.mark.usefixtures('qapp')

tests/unit/utils/test_urlutils.py

@@ -28,7 +28,7 @@ from PyQt5.QtNetwork import QNetworkProxy
 import pytest
 
 from qutebrowser.commands import cmdexc
-from qutebrowser.browser.webkit.network import pac
+from qutebrowser.browser.network import pac
 from qutebrowser.utils import utils, urlutils, qtutils, usertypes