Mercurial Repositories > eric / changeset

--- a/E5Network/E5NetworkProxyFactory.py	Mon May 31 15:15:20 2010 +0200
+++ b/E5Network/E5NetworkProxyFactory.py	Mon May 31 15:36:05 2010 +0200
@@ -114,7 +114,9 @@
                             Preferences.getUI("ProxyUser/{0}".format(scheme)))
                         proxyList[0].setPassword(
                             Preferences.getUI("ProxyPassword/{0}".format(scheme)))
-                return proxyList
+                    return proxyList
+                else:
+                    return [QNetworkProxy(QNetworkProxy.NoProxy)]
             else:
                 if Preferences.getUI("UseHttpProxyForAll"):
                     protocol = "Http"

--- a/Helpviewer/HelpWindow.py	Mon May 31 15:15:20 2010 +0200
+++ b/Helpviewer/HelpWindow.py	Mon May 31 15:36:05 2010 +0200
@@ -1445,7 +1445,10 @@
         if url.isValid():
             return url
         
-        return QUrl(path)
+        try:
+            return QUrl.fromUserInput(path)
+        except AttributeError:
+            return QUrl(path)
     
     def __setPathComboBackground(self):
         """