summaryrefslogtreecommitdiffstats
path: root/Lib/subprocess.py
diff options
context:
space:
mode:
authorGregory P. Smith <greg@mad-scientist.com>2009-08-13 18:33:30 (GMT)
committerGregory P. Smith <greg@mad-scientist.com>2009-08-13 18:33:30 (GMT)
commit10d2952e8d76ba70c2954fa22b8b532f3d7eb350 (patch)
treee7477164ad4ed85303a0591545a94f5c6229af96 /Lib/subprocess.py
parentf32a5f4acc0bcdde3cd5cbc04e1ff03d5ec00b05 (diff)
downloadcpython-10d2952e8d76ba70c2954fa22b8b532f3d7eb350.zip
cpython-10d2952e8d76ba70c2954fa22b8b532f3d7eb350.tar.gz
cpython-10d2952e8d76ba70c2954fa22b8b532f3d7eb350.tar.bz2
Merged revisions 73917 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k (the changes that add a select.PIPE_BUF attribute were removed) This merge fixes issue3392 ................ r73917 | amaury.forgeotdarc | 2009-07-09 15:44:11 -0700 (Thu, 09 Jul 2009) | 12 lines Merged revisions 73916 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r73916 | amaury.forgeotdarc | 2009-07-10 00:37:22 +0200 (ven., 10 juil. 2009) | 5 lines #6416: Fix compilation of the select module on Windows, as well as test_subprocess: PIPE_BUF is not defined on Windows, and probably has no meaning there. Anyway the subprocess module uses another way to perform non-blocking reads (with a thread) ........ ................
Diffstat (limited to 'Lib/subprocess.py')
-rw-r--r--Lib/subprocess.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index 6a86397..06454f3 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -376,6 +376,12 @@ else:
import fcntl
import pickle
+ # When select or poll has indicated that the file is writable,
+ # we can write up to _PIPE_BUF bytes without risk of blocking.
+ # POSIX defines PIPE_BUF as >= 512.
+ _PIPE_BUF = getattr(select, 'PIPE_BUF', 512)
+
+
__all__ = ["Popen", "PIPE", "STDOUT", "call", "check_call", "getstatusoutput",
"getoutput", "check_output", "CalledProcessError"]
@@ -384,11 +390,6 @@ try:
except:
MAXFD = 256
-# When select or poll has indicated that the file is writable,
-# we can write up to _PIPE_BUF bytes without risk of blocking.
-# POSIX defines PIPE_BUF as >= 512.
-_PIPE_BUF = getattr(select, 'PIPE_BUF', 512)
-
_active = []
def _cleanup():