[Python-checkins] r67540 - in python/branches/release30-maint: Lib/webbrowser.py Misc/NEWS

[amaury.forgeotdarc]

Author: amaury.forgeotdarc
Date: Fri Dec  5 02:07:15 2008
New Revision: 67540

Log:
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
........


Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Lib/webbrowser.py
   python/branches/release30-maint/Misc/NEWS

Modified: python/branches/release30-maint/Lib/webbrowser.py
==============================================================================
--- python/branches/release30-maint/Lib/webbrowser.py	(original)
+++ python/branches/release30-maint/Lib/webbrowser.py	Fri Dec  5 02:07:15 2008
@@ -223,7 +223,7 @@
         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

Modified: python/branches/release30-maint/Misc/NEWS
==============================================================================
--- python/branches/release30-maint/Misc/NEWS	(original)
+++ python/branches/release30-maint/Misc/NEWS	Fri Dec  5 02:07:15 2008
@@ -15,6 +15,9 @@
 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.