Merge branch 'kiryl-pac+file'

CHANGELOG.asciidoc

@@ -45,6 +45,8 @@ Changed
 - qutebrowser now automatically uses QtWebEngine if QtWebKit is unavailable
 - :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
+- `network -> proxy` can also be set to `pac+file://...` now to
+  use a local proxy autoconfig file (on QtWebKit)
 
 Fixed
 -----

README.asciidoc

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

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 = {

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)