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

Move proxy/pac out of QtWebKit folder

Browse Source
This commit is contained in:
Florian Bruhin 2016-12-22 13:54:11 +01:00
parent b220b5438f
commit 6c1b7dcca1
6 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
qutebrowser/browser/webkit/network/pac.py → qutebrowser/browser/network/pac.py
View File

2
qutebrowser/browser/webkit/network/proxy.py → qutebrowser/browser/network/proxy.py
View File

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

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

@ -32,8 +32,9 @@ from PyQt5.QtWebKit import QWebSettings
from PyQt5.QtPrintSupport import QPrinter from PyQt5.QtPrintSupport import QPrinter
from qutebrowser.browser import browsertab from qutebrowser.browser import browsertab
from qutebrowser.browser.network import proxy
from qutebrowser.browser.webkit import webview, tabhistory, webkitelem 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 from qutebrowser.utils import qtutils, objreg, usertypes, utils, log

2
qutebrowser/utils/urlutils.py
View File

@ -32,7 +32,7 @@ from PyQt5.QtNetwork import QHostInfo, QHostAddress, QNetworkProxy
from qutebrowser.config import config, configexc from qutebrowser.config import config, configexc
from qutebrowser.utils import log, qtutils, message, utils from qutebrowser.utils import log, qtutils, message, utils
from qutebrowser.commands import cmdexc 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 # FIXME: we probably could raise some exceptions on invalid URLs

2
tests/unit/browser/webkit/network/test_pac.py
View File

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

2
tests/unit/utils/test_urlutils.py
View File

@ -28,7 +28,7 @@ from PyQt5.QtNetwork import QNetworkProxy
import pytest import pytest
from qutebrowser.commands import cmdexc 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 from qutebrowser.utils import utils, urlutils, qtutils, usertypes