diff options
| author | Gregory P. Smith <greg@mad-scientist.com> | 2009-08-13 18:33:30 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@mad-scientist.com> | 2009-08-13 18:33:30 (GMT) |
| commit | 10d2952e8d76ba70c2954fa22b8b532f3d7eb350 (patch) | |
| tree | e7477164ad4ed85303a0591545a94f5c6229af96 /Lib/test | |
| parent | f32a5f4acc0bcdde3cd5cbc04e1ff03d5ec00b05 (diff) | |
| download | cpython-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/test')
| -rw-r--r-- | Lib/test/test_subprocess.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index f2a396c..265859a 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 |