Merged revisions 67539 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r67539 | amaury.forgeotdarc | 2008-12-05 02:02:21 +0100 (ven., 05 déc. 2008) | 5 lines

  Issue #4537: webbrowser.UnixBrowser failed because this module defines an open()
  function which shadows the builtin.

  Will backport to 3.0
........

diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
index 4772adc6c05d4c850dd508bc43afdcb13a0a707f..18dc11b191bdb73c2a54a2929bf4c40465d9a1b8 100644 (file)
--- a/Lib/webbrowser.py
+++ b/Lib/webbrowser.py
@@ -223,7 +223,7 @@ class UnixBrowser(BaseBrowser):
         cmdline = [self.name] + raise_opt + args
 
         if remote or self.background:
-            inout = open(os.devnull, "r+")
+            inout = io.open(os.devnull, "r+")
         else:
             # for TTY browsers, we need stdin/out
             inout = None

diff --git a/Misc/NEWS b/Misc/NEWS
index d0e055235da63d805f73d4758059ed6edd5b75d6..e2a72394ffa8fcf5773a7c20caa7bf6f0e6b203a 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -15,6 +15,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #4537: webbrowser.UnixBrowser would fail to open the browser because
+  it was calling the wrong open() function.
+
 - Issue #1055234: cgi.parse_header(): Fixed parsing of header parameters to
   support unusual filenames (such as those containing semi-colons) in
   Content-Disposition headers.