summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2002-10-11 22:04:22 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2002-10-11 22:04:22 (GMT)
commit520cdf733aa8bfff48369822802a2df913851fcb (patch)
tree35dcb66645c00daeafc8b2dfa037eee1a75ed62a /Lib
parent98a355d0b3bc1f1706b69ba77b31342bad9c0646 (diff)
downloadcpython-520cdf733aa8bfff48369822802a2df913851fcb.zip
cpython-520cdf733aa8bfff48369822802a2df913851fcb.tar.gz
cpython-520cdf733aa8bfff48369822802a2df913851fcb.tar.bz2
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.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/webbrowser.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
index ac8ce58..efdebdc 100644
--- 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