From 6c1b7dcca12e1f8860b90f3df4b5783afad7adab Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 22 Dec 2016 13:54:11 +0100
Subject: [PATCH] Move proxy/pac out of QtWebKit folder

---
 qutebrowser/browser/{webkit => }/network/pac.py   | 0
 qutebrowser/browser/{webkit => }/network/proxy.py | 2 +-
 qutebrowser/browser/webkit/webkittab.py           | 3 ++-
 qutebrowser/utils/urlutils.py                     | 2 +-
 tests/unit/browser/webkit/network/test_pac.py     | 2 +-
 tests/unit/utils/test_urlutils.py                 | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)
 rename qutebrowser/browser/{webkit => }/network/pac.py (100%)
 rename qutebrowser/browser/{webkit => }/network/proxy.py (98%)

diff --git a/qutebrowser/browser/webkit/network/pac.py b/qutebrowser/browser/network/pac.py
similarity index 100%
rename from qutebrowser/browser/webkit/network/pac.py
rename to qutebrowser/browser/network/pac.py
diff --git a/qutebrowser/browser/webkit/network/proxy.py b/qutebrowser/browser/network/proxy.py
similarity index 98%
rename from qutebrowser/browser/webkit/network/proxy.py
rename to qutebrowser/browser/network/proxy.py
index db52482d2..719c33178 100644
--- a/qutebrowser/browser/webkit/network/proxy.py
+++ b/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():
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 1a9a91b49..12c643f46 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/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
 
 
diff --git a/qutebrowser/utils/urlutils.py b/qutebrowser/utils/urlutils.py
index ae5733bc6..e70cc41fa 100644
--- a/qutebrowser/utils/urlutils.py
+++ b/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
diff --git a/tests/unit/browser/webkit/network/test_pac.py b/tests/unit/browser/webkit/network/test_pac.py
index b99675b6a..ebb081aff 100644
--- a/tests/unit/browser/webkit/network/test_pac.py
+++ b/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')
diff --git a/tests/unit/utils/test_urlutils.py b/tests/unit/utils/test_urlutils.py
index 06196f5d2..10ba54b3a 100644
--- a/tests/unit/utils/test_urlutils.py
+++ b/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