Merged remote changes.

Mon, 31 May 2010 19:21:10 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Mon, 31 May 2010 19:21:10 +0200
changeset 322
e7c8fa889856
parent 321
de7a39389bdc (current diff)
parent 319
09f456ec6fcf (diff)
child 323
75182cd9b2c5

Merged remote changes.

--- a/E5Network/E5NetworkProxyFactory.py	Mon May 31 19:20:34 2010 +0200
+++ b/E5Network/E5NetworkProxyFactory.py	Mon May 31 19:21:10 2010 +0200
@@ -105,15 +105,18 @@
                                                   url.userName(), url.password())
                             proxyList = [proxy]
                             break
-                scheme = schemeFromProxyType(proxyList[0].type())
-                if scheme == "":
-                    scheme = "Http"
-                if scheme != "NoProxy":
-                    proxyList[0].setUser(
-                        Preferences.getUI("ProxyUser/{0}".format(scheme)))
-                    proxyList[0].setPassword(
-                        Preferences.getUI("ProxyPassword/{0}".format(scheme)))
-                return proxyList
+                if proxyList:
+                    scheme = schemeFromProxyType(proxyList[0].type())
+                    if scheme == "":
+                        scheme = "Http"
+                    if scheme != "NoProxy":
+                        proxyList[0].setUser(
+                            Preferences.getUI("ProxyUser/{0}".format(scheme)))
+                        proxyList[0].setPassword(
+                            Preferences.getUI("ProxyPassword/{0}".format(scheme)))
+                    return proxyList
+                else:
+                    return [QNetworkProxy(QNetworkProxy.NoProxy)]
             else:
                 if Preferences.getUI("UseHttpProxyForAll"):
                     protocol = "Http"
--- a/Helpviewer/HelpWindow.py	Mon May 31 19:20:34 2010 +0200
+++ b/Helpviewer/HelpWindow.py	Mon May 31 19:21:10 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):
         """

eric ide

mercurial