summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Lagerwall <rosslagerwall@gmail.com>2011-12-22 07:10:47 (GMT)
committerRoss Lagerwall <rosslagerwall@gmail.com>2011-12-22 07:10:47 (GMT)
commit0b77ac32b204188fa9874299ca39da885365254a (patch)
tree4878bc507c2e59d0071418ee90e3304c6a3f1888
parent80bc72d5a2f7550edbd63d577bb8fb1e3bbba69c (diff)
parent031bf95d3212d246a44e8e3a23ff32023ab905e9 (diff)
downloadcpython-0b77ac32b204188fa9874299ca39da885365254a.zip
cpython-0b77ac32b204188fa9874299ca39da885365254a.tar.gz
cpython-0b77ac32b204188fa9874299ca39da885365254a.tar.bz2
Merge with 3.2 for #11006.
-rw-r--r--Misc/NEWS2
-rw-r--r--Modules/_posixsubprocess.c6
2 files changed, 2 insertions, 6 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index d3587dd..425eedc 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -419,6 +419,8 @@ Core and Builtins
Library
-------
+- Issue #11006: Don't issue low level warning in subprocess when pipe2() fails.
+
- Issue #13620: Support for Chrome browser in webbrowser.py Patch contributed
by Arnaud Calmettes.
diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c
index 301f2a5..603fd91 100644
--- a/Modules/_posixsubprocess.c
+++ b/Modules/_posixsubprocess.c
@@ -442,12 +442,6 @@ subprocess_cloexec_pipe(PyObject *self, PyObject *noargs)
Py_END_ALLOW_THREADS
if (res != 0 && errno == ENOSYS)
{
- if (PyErr_WarnEx(
- PyExc_RuntimeWarning,
- "pipe2 set errno ENOSYS; falling "
- "back to non-atomic pipe+fcntl.", 1) != 0) {
- return NULL;
- }
{
#endif
/* We hold the GIL which offers some protection from other code calling