Mercurial Repositories > eric / file diff

--- a/src/eric7/EricNetwork/EricNetworkProxyFactory.py	Tue Dec 17 18:14:10 2024 +0100
+++ b/src/eric7/EricNetwork/EricNetworkProxyFactory.py	Wed Dec 18 16:45:04 2024 +0100
@@ -164,14 +164,14 @@
         @return list of proxies in order of preference
         @rtype list of QNetworkProxy
         """
-        if (
+        # use proxy at all?
+        if not EricPreferences.getNetworkProxy("UseProxy"):
+            return [QNetworkProxy(QNetworkProxy.ProxyType.NoProxy)]
+
+        elif (
             query.queryType() == QNetworkProxyQuery.QueryType.UrlRequest
             and query.protocolTag() in ["http", "https", "ftp"]
         ):
-            # use proxy at all?
-            if not EricPreferences.getNetworkProxy("UseProxy"):
-                return [QNetworkProxy(QNetworkProxy.ProxyType.NoProxy)]
-
             # test for exceptions
             exceptions = EricPreferences.getNetworkProxy("ProxyExceptions")
             if exceptions != self.__exceptions:
@@ -273,5 +273,6 @@
                     else:
                         proxy = QNetworkProxy(QNetworkProxy.ProxyType.DefaultProxy)
                     return [proxy, QNetworkProxy(QNetworkProxy.ProxyType.DefaultProxy)]
+
         else:
             return [QNetworkProxy(QNetworkProxy.ProxyType.NoProxy)]