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

Merge branch 'pac+file' of https://github.com/kiryl/qutebrowser into kiryl-pac+file

Browse Source
This commit is contained in:
Florian Bruhin 2017-02-22 07:35:06 +01:00
commit 5379138c17
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qutebrowser/utils/urlutils.py
View File

@ -613,7 +613,7 @@ def proxy_from_url(url):
raise InvalidUrlError(url) raise InvalidUrlError(url)
scheme = url.scheme() scheme = url.scheme()
if scheme in ['pac+http', 'pac+https']: if scheme in ['pac+http', 'pac+https', 'pac+file']:
return pac.PACFetcher(url) return pac.PACFetcher(url)
types = { types = {

1
tests/unit/config/test_configtypes.py
View File

@ -1483,6 +1483,7 @@ class TestProxy:
'none', 'none',
'http://user:pass@example.com:2323/', 'http://user:pass@example.com:2323/',
'pac+http://example.com/proxy.pac', 'pac+http://example.com/proxy.pac',
'pac+file:///tmp/proxy.pac'
]) ])
def test_validate_valid(self, klass, val): def test_validate_valid(self, klass, val):
klass(none_ok=True).validate(val) klass(none_ok=True).validate(val)