Mercurial Repositories > eric / file diff

--- a/eric6/E5Network/E5NetworkProxyFactory.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Network/E5NetworkProxyFactory.py	Tue Mar 02 17:17:09 2021 +0100
@@ -31,13 +31,13 @@
     @return scheme (string, one of Http, Https, Ftp)
     """
     scheme = ""
-    if proxyType == QNetworkProxy.HttpProxy:
+    if proxyType == QNetworkProxy.ProxyType.HttpProxy:
         scheme = "Http"
-    elif proxyType == QNetworkProxy.HttpCachingProxy:
+    elif proxyType == QNetworkProxy.ProxyType.HttpCachingProxy:
         scheme = "Https"
-    elif proxyType == QNetworkProxy.FtpCachingProxy:
+    elif proxyType == QNetworkProxy.ProxyType.FtpCachingProxy:
         scheme = "Ftp"
-    elif proxyType == QNetworkProxy.NoProxy:
+    elif proxyType == QNetworkProxy.ProxyType.NoProxy:
         scheme = "NoProxy"
     return scheme
 
@@ -57,7 +57,7 @@
     from UI.AuthenticationDialog import AuthenticationDialog
     dlg = AuthenticationDialog(info, proxy.user(), True)
     dlg.setData(proxy.user(), proxy.password())
-    if dlg.exec() == QDialog.Accepted:
+    if dlg.exec() == QDialog.DialogCode.Accepted:
         username, password = dlg.getData()
         auth.setUser(username)
         auth.setPassword(password)
@@ -158,12 +158,12 @@
         @return list of proxies in order of preference (list of QNetworkProxy)
         """
         if (
-            query.queryType() == QNetworkProxyQuery.UrlRequest and
+            query.queryType() == QNetworkProxyQuery.QueryType.UrlRequest and
             query.protocolTag() in ["http", "https", "ftp"]
         ):
             # use proxy at all ?
             if not Preferences.getUI("UseProxy"):
-                return [QNetworkProxy(QNetworkProxy.NoProxy)]
+                return [QNetworkProxy(QNetworkProxy.ProxyType.NoProxy)]
             
             # test for exceptions
             exceptions = Preferences.getUI("ProxyExceptions")
@@ -172,7 +172,7 @@
             urlHost = query.url().host()
             for matcher in self.__hostnameMatchers:
                 if matcher.match(urlHost):
-                    return [QNetworkProxy(QNetworkProxy.NoProxy)]
+                    return [QNetworkProxy(QNetworkProxy.ProxyType.NoProxy)]
             
             # determine proxy
             if Preferences.getUI("UseSystemProxy"):
@@ -180,7 +180,7 @@
                 if (
                     not Globals.isWindowsPlatform() and
                     len(proxyList) == 1 and
-                    proxyList[0].type() == QNetworkProxy.NoProxy
+                    proxyList[0].type() == QNetworkProxy.ProxyType.NoProxy
                 ):
                     # try it the Python way
                     # scan the environment for variables named <scheme>_proxy
@@ -194,11 +194,13 @@
                         ):
                             url = QUrl(value)
                             if url.scheme() in ["http", "https"]:
-                                proxyType = QNetworkProxy.HttpProxy
+                                proxyType = QNetworkProxy.ProxyType.HttpProxy
                             elif url.scheme() == "ftp":
-                                proxyType = QNetworkProxy.FtpCachingProxy
+                                proxyType = (
+                                    QNetworkProxy.ProxyType.FtpCachingProxy
+                                )
                             else:
-                                proxyType = QNetworkProxy.HttpProxy
+                                proxyType = QNetworkProxy.ProxyType.HttpProxy
                             proxy = QNetworkProxy(
                                 proxyType, url.host(), url.port(),
                                 url.userName(), url.password())
@@ -216,7 +218,7 @@
                                 "ProxyPassword/{0}".format(scheme)))
                     return proxyList
                 else:
-                    return [QNetworkProxy(QNetworkProxy.NoProxy)]
+                    return [QNetworkProxy(QNetworkProxy.ProxyType.NoProxy)]
             else:
                 if Preferences.getUI("UseHttpProxyForAll"):
                     protocolKey = "Http"
@@ -234,20 +236,26 @@
                             """Proxy usage was activated"""
                             """ but no proxy host for protocol"""
                             """ '{0}' configured.""").format(protocolKey))
-                    return [QNetworkProxy(QNetworkProxy.DefaultProxy)]
+                    return [
+                        QNetworkProxy(QNetworkProxy.ProxyType.DefaultProxy)
+                    ]
                 else:
                     if protocolKey in ["Http", "Https", "Ftp"]:
                         if query.protocolTag() == "ftp":
-                            proxyType = QNetworkProxy.FtpCachingProxy
+                            proxyType = QNetworkProxy.ProxyType.FtpCachingProxy
                         else:
-                            proxyType = QNetworkProxy.HttpProxy
+                            proxyType = QNetworkProxy.ProxyType.HttpProxy
                         proxy = QNetworkProxy(
                             proxyType, host,
                             Preferences.getUI("ProxyPort/" + protocolKey),
                             Preferences.getUI("ProxyUser/" + protocolKey),
                             Preferences.getUI("ProxyPassword/" + protocolKey))
                     else:
-                        proxy = QNetworkProxy(QNetworkProxy.DefaultProxy)
-                    return [proxy, QNetworkProxy(QNetworkProxy.DefaultProxy)]
+                        proxy = QNetworkProxy(
+                            QNetworkProxy.ProxyType.DefaultProxy)
+                    return [
+                        proxy,
+                        QNetworkProxy(QNetworkProxy.ProxyType.DefaultProxy)
+                    ]
         else:
-            return [QNetworkProxy(QNetworkProxy.NoProxy)]
+            return [QNetworkProxy(QNetworkProxy.ProxyType.NoProxy)]