Mercurial Repositories > eric / changeset

--- a/E5Network/E5NetworkProxyFactory.py	Sat Oct 08 18:15:45 2011 +0200
+++ b/E5Network/E5NetworkProxyFactory.py	Sat Oct 08 18:16:04 2011 +0200
@@ -87,8 +87,7 @@
            Preferences.getUI("UseProxy"):
             if Preferences.getUI("UseSystemProxy"):
                 proxyList = QNetworkProxyFactory.systemProxyForQuery(query)
-                if (not Globals.isWindowsPlatform() and \
-                    not Globals.isMacPlatform()) and \
+                if not Globals.isWindowsPlatform() and \
                    len(proxyList) == 1 and \
                    proxyList[0].type() == QNetworkProxy.NoProxy:
                     # try it the Python way

--- a/Globals/__init__.py	Sat Oct 08 18:15:45 2011 +0200
+++ b/Globals/__init__.py	Sat Oct 08 18:16:04 2011 +0200
@@ -76,11 +76,8 @@
                 interpreter = os.path.join(path, exe)
                 if os.path.isfile(interpreter):
                     interpreters.append(interpreter)
-##    elif isMacPlatform():
-##        # don't know how to do this due to lack of a Mac
-##        pass
     else:
-        # search interpreters on Posix platforms
+        # search interpreters on Posix and Mac platforms
         for path in posixPathList:
             for version in posixVersionsList:
                 interpreter = os.path.join(path, "python{0}".format(version))