diff -r c5e3705073eb -r 50dbe65a1334 eric6/E5Network/E5NetworkProxyFactory.py
--- a/eric6/E5Network/E5NetworkProxyFactory.py Sat Sep 21 15:37:43 2019 +0200
+++ b/eric6/E5Network/E5NetworkProxyFactory.py Sat Sep 21 16:04:17 2019 +0200
@@ -12,8 +12,9 @@
from PyQt5.QtCore import Qt, QUrl, QCoreApplication, QRegExp
from PyQt5.QtWidgets import QDialog
-from PyQt5.QtNetwork import QNetworkProxyFactory, QNetworkProxy, \
- QNetworkProxyQuery
+from PyQt5.QtNetwork import (
+ QNetworkProxyFactory, QNetworkProxy, QNetworkProxyQuery
+)
from E5Gui import E5MessageBox
@@ -50,8 +51,8 @@
"""
info = QCoreApplication.translate(
"E5NetworkProxyFactory",
- "<b>Connect to proxy '{0}' using:</b>")\
- .format(Utilities.html_encode(proxy.hostName()))
+ "<b>Connect to proxy '{0}' using:</b>"
+ ).format(Utilities.html_encode(proxy.hostName()))
from UI.AuthenticationDialog import AuthenticationDialog
dlg = AuthenticationDialog(info, proxy.user(), True)
@@ -156,8 +157,10 @@
@param query reference to the query object (QNetworkProxyQuery)
@return list of proxies in order of preference (list of QNetworkProxy)
"""
- if query.queryType() == QNetworkProxyQuery.UrlRequest and \
- query.protocolTag() in ["http", "https", "ftp"]:
+ if (
+ query.queryType() == QNetworkProxyQuery.UrlRequest and
+ query.protocolTag() in ["http", "https", "ftp"]
+ ):
# use proxy at all ?
if not Preferences.getUI("UseProxy"):
return [QNetworkProxy(QNetworkProxy.NoProxy)]
@@ -174,16 +177,21 @@
# determine proxy
if Preferences.getUI("UseSystemProxy"):
proxyList = QNetworkProxyFactory.systemProxyForQuery(query)
- if not Globals.isWindowsPlatform() and \
- len(proxyList) == 1 and \
- proxyList[0].type() == QNetworkProxy.NoProxy:
+ if (
+ not Globals.isWindowsPlatform() and
+ len(proxyList) == 1 and
+ proxyList[0].type() == QNetworkProxy.NoProxy
+ ):
# try it the Python way
# scan the environment for variables named <scheme>_proxy
# scan over whole environment to make this case insensitive
for name, value in os.environ.items():
name = name.lower()
- if value and name[-6:] == '_proxy' and \
- name[:-6] == query.protocolTag().lower():
+ if (
+ value and
+ name[-6:] == '_proxy' and
+ name[:-6] == query.protocolTag().lower()
+ ):
url = QUrl(value)
if url.scheme() in ["http", "https"]:
proxyType = QNetworkProxy.HttpProxy
