[Python-checkins] python/dist/src/Lib webbrowser.py,1.26.6.2,1.26.6.3

2002年10月11日 15:06:15 -0700

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv6042/Lib
Modified Files:
 Tag: release22-maint
	webbrowser.py 
Log Message:
Backport 1.34.
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...'
Index: webbrowser.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/webbrowser.py,v
retrieving revision 1.26.6.2
retrieving revision 1.26.6.3
diff -C2 -d -r1.26.6.2 -r1.26.6.3
*** webbrowser.py	6 Oct 2002 03:10:26 -0000	1.26.6.2
--- webbrowser.py	11 Oct 2002 22:06:12 -0000	1.26.6.3
***************
*** 150,155 ****
 
 def _remote(self, action):
! assert "'" not in action
! cmd = "kfmclient '%s' >/dev/null 2>&1" % action
 rc = os.system(cmd)
 if rc:
--- 150,154 ----
 
 def _remote(self, action):
! cmd = "kfmclient %s >/dev/null 2>&1" % action
 rc = os.system(cmd)
 if rc:
***************
*** 166,169 ****
--- 165,169 ----
 # XXX Currently I know no way to prevent KFM from
 # opening a new win.
+ assert "'" not in url
 self._remote("openURL '%s'" % url)