[Python-checkins] python/dist/src/Lib webbrowser.py,1.33,1.34

2002年10月11日 15:04:25 -0700

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv4884/Lib
Modified Files:
	webbrowser.py 
Log Message:
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.
Index: webbrowser.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/webbrowser.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** webbrowser.py	10 Oct 2002 22:49:29 -0000	1.33
--- webbrowser.py	11 Oct 2002 22:04:22 -0000	1.34
***************
*** 177,182 ****
 
 def _remote(self, action):
! assert "'" not in action
! cmd = "kfmclient '%s' >/dev/null 2>&1" % action
 rc = os.system(cmd)
 if rc:
--- 177,181 ----
 
 def _remote(self, action):
! cmd = "kfmclient %s >/dev/null 2>&1" % action
 rc = os.system(cmd)
 if rc:
***************
*** 193,196 ****
--- 192,196 ----
 # XXX Currently I know no way to prevent KFM from
 # opening a new win.
+ assert "'" not in url
 self._remote("openURL '%s'" % url)