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

Merge branch 'kiryl-pac+file'

Browse Source
This commit is contained in:
Florian Bruhin 2017-02-22 07:42:57 +01:00
commit f952da16be
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.asciidoc
View File

@ -45,6 +45,8 @@ Changed
- qutebrowser now automatically uses QtWebEngine if QtWebKit is unavailable - qutebrowser now automatically uses QtWebEngine if QtWebKit is unavailable
- :history-clear now asks for a confirmation, unless it's run with --force. - :history-clear now asks for a confirmation, unless it's run with --force.
- `input -> mouse-zoom-divider` can now be 0 to disable zooming by mouse wheel - `input -> mouse-zoom-divider` can now be 0 to disable zooming by mouse wheel
- `network -> proxy` can also be set to `pac+file://...` now to
use a local proxy autoconfig file (on QtWebKit)
Fixed Fixed
----- -----

1
README.asciidoc
View File

@ -265,6 +265,7 @@ Contributors, sorted by the number of commits in descending order:
* Matthias Lisin * Matthias Lisin
* Marcel Schilling * Marcel Schilling
* Lazlow Carmichael * Lazlow Carmichael
* Kirill A. Shutemov
* Kevin Wang * Kevin Wang
* Ján Kobezda * Ján Kobezda
* Johannes Martinsson * Johannes Martinsson

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)