Fix webbrowser.BackgroundBrowser on Windows.
diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
index 7a1a3b4..7b0f736 100644
--- a/Lib/webbrowser.py
+++ b/Lib/webbrowser.py
@@ -165,7 +165,10 @@
cmdline = [self.name] + [arg.replace("%s", url)
for arg in self.args]
try:
- p = subprocess.Popen(cmdline, close_fds=True)
+ if sys.platform[:3] == 'win':
+ p = subprocess.Popen(cmdline)
+ else:
+ p = subprocess.Popen(cmdline, close_fds=True)
return not p.wait()
except OSError:
return False
@@ -178,11 +181,14 @@
def open(self, url, new=0, autoraise=1):
cmdline = [self.name] + [arg.replace("%s", url)
for arg in self.args]
- setsid = getattr(os, 'setsid', None)
- if not setsid:
- setsid = getattr(os, 'setpgrp', None)
try:
- p = subprocess.Popen(cmdline, close_fds=True, preexec_fn=setsid)
+ if sys.platform[:3] == 'win':
+ p = subprocess.Popen(cmdline)
+ else:
+ setsid = getattr(os, 'setsid', None)
+ if not setsid:
+ setsid = getattr(os, 'setpgrp', None)
+ p = subprocess.Popen(cmdline, close_fds=True, preexec_fn=setsid)
return (p.poll() is None)
except OSError:
return False
diff --git a/Misc/NEWS b/Misc/NEWS
index d7f1e75..891c785 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -52,6 +52,9 @@
Library
-------
+- Make webbrowser.BackgroundBrowser usable in Windows (it wasn't because
+ the close_fds arg to subprocess.Popen is not supported).
+
- Reverted patch #1504333 to sgmllib because it introduced an infinite loop.
- Patch #1553314: Fix the inspect.py slowdown that was hurting IPython & SAGE