diff options
author | Gregory P. Smith <greg@mad-scientist.com> | 2009-08-13 18:33:30 +0000 |
---|---|---|
committer | Gregory P. Smith <greg@mad-scientist.com> | 2009-08-13 18:33:30 +0000 |
commit | 10d2952e8d76ba70c2954fa22b8b532f3d7eb350 (patch) | |
tree | e7477164ad4ed85303a0591545a94f5c6229af96 | |
parent | unblock merge of 73917, it is needed to fix issue 3392 (diff) | |
download | cpython-10d2952e8d76ba70c2954fa22b8b532f3d7eb350.tar.gz cpython-10d2952e8d76ba70c2954fa22b8b532f3d7eb350.tar.bz2 cpython-10d2952e8d76ba70c2954fa22b8b532f3d7eb350.zip |
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)
........
................
-rw-r--r-- | Lib/subprocess.py | 11 | ||||
-rw-r--r-- | Lib/test/test_subprocess.py | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Lib/subprocess.py b/Lib/subprocess.py index 6a863972c3b..06454f37fd1 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(): diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index f2a396cd10f..265859a21d9 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -801,7 +801,7 @@ class CommandTests(unittest.TestCase): unit_tests = [ProcessTestCase, CommandTests] -if subprocess._has_poll: +if getattr(subprocess, '_has_poll', False): class ProcessTestCaseNoPoll(ProcessTestCase): def setUp(self): subprocess._has_poll = False |