summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>2008-05-12 14:41:00 (GMT)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>2008-05-12 14:41:00 (GMT)
commit2b2b44dc2c2b95569e0e59c6dd4b12148ffba598 (patch)
tree1310fd26ce43af4226358c436271f4a1054ee8fe
parent0740459248d1c01d393b52cff5f3a9b561e32e7c (diff)
downloadcpython-2b2b44dc2c2b95569e0e59c6dd4b12148ffba598.zip
cpython-2b2b44dc2c2b95569e0e59c6dd4b12148ffba598.tar.gz
cpython-2b2b44dc2c2b95569e0e59c6dd4b12148ffba598.tar.bz2
#Issue2835: Correct an infinite recursion in webbrowser.open(), when KDE Konqueror is tried.
-rw-r--r--Lib/webbrowser.py3
-rw-r--r--Misc/NEWS2
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
index a028df0..4772adc 100644
--- a/Lib/webbrowser.py
+++ b/Lib/webbrowser.py
@@ -347,7 +347,8 @@ class Konqueror(BaseBrowser):
else:
action = "openURL"
- devnull = open(os.devnull, "r+")
+ import io
+ devnull = io.open(os.devnull, "r+")
# if possible, put browser in separate process group, so
# keyboard interrupts don't affect browser as well as Python
setsid = getattr(os, 'setsid', None)
diff --git a/Misc/NEWS b/Misc/NEWS
index e40844e..3f0b4a9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -25,6 +25,8 @@ Extension Modules
Library
-------
+- Issue 2865: webbrowser.open() works again in a KDE environment.
+
- The multifile module has been removed.
- The SocketServer module has been renamed to socketserver.