mirror of
https://github.com/python/cpython.git
synced 2025-12-09 10:37:17 +00:00
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)
........
................
This commit is contained in:
parent
f32a5f4acc
commit
10d2952e8d
2 changed files with 7 additions and 6 deletions
|
|
@ -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():
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue