Mercurial Repositories > eric / changeset

--- a/E5Network/E5NetworkProxyFactory.py	Mon May 31 19:21:54 2010 +0200
+++ b/E5Network/E5NetworkProxyFactory.py	Mon May 31 19:22:29 2010 +0200
@@ -57,9 +57,12 @@
                                                   url.userName(), url.password())
                             proxyList = [proxy]
                             break
-                proxyList[0].setUser(Preferences.getUI("ProxyUser"))
-                proxyList[0].setPassword(Preferences.getUI("ProxyPassword"))
-                return proxyList
+                if proxyList:
+                    proxyList[0].setUser(Preferences.getUI("ProxyUser"))
+                    proxyList[0].setPassword(Preferences.getUI("ProxyPassword"))
+                    return proxyList
+                else:
+                    return [QNetworkProxy(QNetworkProxy.NoProxy)]
             else:
                 host = Preferences.getUI("ProxyHost")
                 if not host:

--- a/Helpviewer/HelpWindow.py	Mon May 31 19:21:54 2010 +0200
+++ b/Helpviewer/HelpWindow.py	Mon May 31 19:22:29 2010 +0200
@@ -1429,7 +1429,10 @@
         if url.isValid():
             return url
         
-        return QUrl(path)
+        try:
+            return QUrl.fromUserInput(path)
+        except AttributeError:
+            return QUrl(path)
     
     def __setPathComboBackground(self):
         """