Damien Elmes 2020-06-01 07:18:13 +10:00
parent f4004ad704
commit caf95742da

View file

@ -477,14 +477,23 @@ section of the manual, and ensure that location is not read-only.""",
# proxy configured? # proxy configured?
from urllib.request import proxy_bypass, getproxies from urllib.request import proxy_bypass, getproxies
if "http" in getproxies(): disable_proxies = False
# if it's not set up to bypass localhost, we'll try:
# need to disable proxies in the webviews if "http" in getproxies():
if not proxy_bypass("127.0.0.1"): # if it's not set up to bypass localhost, we'll
print("webview proxy use disabled") # need to disable proxies in the webviews
proxy = QNetworkProxy() if not proxy_bypass("127.0.0.1"):
proxy.setType(QNetworkProxy.NoProxy) disable_proxies = True
QNetworkProxy.setApplicationProxy(proxy) except UnicodeDecodeError:
# proxy_bypass can't handle unicode in hostnames; assume we need
# to disable proxies
disable_proxies = True
if disable_proxies:
print("webview proxy use disabled")
proxy = QNetworkProxy()
proxy.setType(QNetworkProxy.NoProxy)
QNetworkProxy.setApplicationProxy(proxy)
# we must have a usable temp dir # we must have a usable temp dir
try: try: