SF # 539360, webbrowser.py and konqueror, by Andy McKay

Fix Konqueror so it can start when calling open().
The assert needed to be on the raw URL, not openURL 'url...'

Will backport.

diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
index ac8ce58e97d22c656997ad2035606c5661524063..efdebdc8b1a35112ab2c7a2336cc46a9d3f79ba6 100644 (file)
--- a/Lib/webbrowser.py
+++ b/Lib/webbrowser.py
@@ -176,8 +176,7 @@ class Konqueror:
             self.name = self.basename = "kfm"
 
     def _remote(self, action):
-        assert "'" not in action
-        cmd = "kfmclient '%s' >/dev/null 2>&1" % action
+        cmd = "kfmclient %s >/dev/null 2>&1" % action
         rc = os.system(cmd)
         if rc:
             import time
@@ -192,6 +191,7 @@ class Konqueror:
     def open(self, url, new=1, autoraise=1):
         # XXX Currently I know no way to prevent KFM from
         # opening a new win.
+        assert "'" not in url
         self._remote("openURL '%s'" % url)
 
     open_new = open