[Python-checkins] python/dist/src/Lib webbrowser.py,1.39,1.40

Sat Oct 8 22:47:41 CEST 2005

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16413/Lib
Modified Files:
	webbrowser.py 
Log Message:
Fix errors in _synthesize because of missing basename attribute of
browser controller classes.
Index: webbrowser.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/webbrowser.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40

--- webbrowser.py	4 Oct 2005 03:17:49 -0000	1.39
+++ webbrowser.py	8 Oct 2005 20:47:38 -0000	1.40
@@ -133,6 +133,7 @@
 
 def __init__(self, name=""):
 self.name = name
+ self.basename = name
 
 def open(self, url, new=0, autoraise=1):
 raise NotImplementedError
@@ -150,6 +151,7 @@
 
 def __init__(self, cmd):
 self.name, self.args = cmd.split(None, 1)
+ self.basename = os.path.basename(self.name)
 
 def open(self, url, new=0, autoraise=1):
 assert "'" not in url
@@ -358,8 +360,10 @@
 commd + " '%s' >/dev/null &"))
 
 # Konqueror/kfm, the KDE browser.
- if _iscommand("kfm") or _iscommand("konqueror"):
- register("kfm", Konqueror, Konqueror())
+ if _iscommand("kfm"):
+ register("kfm", Konqueror, Konqueror("kfm"))
+ elif _iscommand("konqueror"):
+ register("konqueror", Konqueror, Konqueror("konqueror"))
 
 # Gnome's Galeon and Epiphany
 for browser in ("galeon", "epiphany"):
