this closes patches item 429136 and brings the release21-maint version into

sync with the head branch.

diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
index ad195e0a3d0923df385110c6da07f449e8f7e5f7..055705de90b446f712acbb2458f7b76bea7e4d0c 100644 (file)
--- a/Lib/webbrowser.py
+++ b/Lib/webbrowser.py
@@ -306,11 +306,14 @@ if os.environ.has_key("BROWSER"):
     # It's the user's responsibility to register handlers for any unknown
     # browser referenced by this value, before calling open().
     _tryorder = os.environ["BROWSER"].split(":")
-else:
-    # Optimization: filter out alternatives that aren't available, so we can
-    # avoid has_key() tests at runtime.  (This may also allow some unused
-    # classes and class-instance storage to be garbage-collected.)
-    _tryorder = filter(lambda x: _browsers.has_key(x.lower())
-                       or x.find("%s") > -1, _tryorder)
+
+for cmd in _tryorder:
+    if not _browsers.has_key(cmd.lower()):
+        if _iscommand(cmd.lower()):
+            register(cmd.lower(), None, GenericBrowser("%s %%s" % cmd.lower()))
+
+_tryorder = filter(lambda x: _browsers.has_key(x.lower())
+                   or x.find("%s") > -1, _tryorder)
+# what to do if _tryorder is now empty?
 
 # end