diff options
| author | Florian Bruhin <git@the-compiler.org> | 2017-02-22 07:35:06 +0100 |
|---|---|---|
| committer | Florian Bruhin <git@the-compiler.org> | 2017-02-22 07:35:06 +0100 |
| commit | 5379138c176597952bf873ca23b2358c65fce783 (patch) | |
| tree | 97bacfe3a0f0f0f05e35cda8955c91c993af4776 | |
| parent | e8443241df0da7fb78cceccaafd6c856fcd850dd (diff) | |
| parent | de088c18b9c9efdc37fc5b4229179ec7ed25d748 (diff) | |
| download | qutebrowser-5379138c176597952bf873ca23b2358c65fce783.tar.gz qutebrowser-5379138c176597952bf873ca23b2358c65fce783.zip | |
Merge branch 'pac+file' of https://github.com/kiryl/qutebrowser into kiryl-pac+file
| -rw-r--r-- | qutebrowser/utils/urlutils.py | 2 | ||||
| -rw-r--r-- | tests/unit/config/test_configtypes.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/qutebrowser/utils/urlutils.py b/qutebrowser/utils/urlutils.py index 7e3827fcd..1beebbe92 100644 --- a/qutebrowser/utils/urlutils.py +++ b/qutebrowser/utils/urlutils.py @@ -613,7 +613,7 @@ def proxy_from_url(url): raise InvalidUrlError(url) scheme = url.scheme() - if scheme in ['pac+http', 'pac+https']: + if scheme in ['pac+http', 'pac+https', 'pac+file']: return pac.PACFetcher(url) types = { diff --git a/tests/unit/config/test_configtypes.py b/tests/unit/config/test_configtypes.py index 1425ad367..f5f66b7f4 100644 --- a/tests/unit/config/test_configtypes.py +++ b/tests/unit/config/test_configtypes.py @@ -1483,6 +1483,7 @@ class TestProxy: 'none', 'http://user:pass@example.com:2323/', 'pac+http://example.com/proxy.pac', + 'pac+file:///tmp/proxy.pac' ]) def test_validate_valid(self, klass, val): klass(none_ok=True).validate(val) |