Merged revisions 73917 via svnmerge from

gregory.p.smith · gregory.p.smith · commit 64ff87fa52c4 · 2009-08-13T18:33:30.000Z
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) ........ ................ git-svn-id: http://svn.python.org/projects/python/branches/release31-maint@74425 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
@@ -376,6 +376,12 @@ class pywintypes:
     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 @@ class pywintypes:
 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
@@ -801,7 +801,7 @@ def test_getoutput(self):
 
 unit_tests = [ProcessTestCase, CommandTests]
 
-if subprocess._has_poll:
+if getattr(subprocess, '_has_poll', False):
     class ProcessTestCaseNoPoll(ProcessTestCase):
         def setUp(self):
             subprocess._has_poll = False
