Merge with 3.2

This commit is contained in:
Ross Lagerwall 2011-03-26 21:22:09 +02:00
commit 4aeb542a72
3 changed files with 5 additions and 0 deletions

View file

@ -1325,6 +1325,7 @@ class POSIXProcessTestCase(BaseTestCase):
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
bufsize=0) bufsize=0)
f = p.stdout f = p.stdout
self.addCleanup(f.close)
try: try:
self.assertEqual(f.read(4), b"appl") self.assertEqual(f.read(4), b"appl")
self.assertIn(f, select.select([f], [], [], 0.0)[0]) self.assertIn(f, select.select([f], [], [], 0.0)[0])

View file

@ -358,6 +358,7 @@ Jonathan Hartley
Larry Hastings Larry Hastings
Shane Hathaway Shane Hathaway
Rycharde Hawkes Rycharde Hawkes
Ben Hayden
Jochen Hayek Jochen Hayek
Christian Heimes Christian Heimes
Thomas Heller Thomas Heller

View file

@ -91,6 +91,9 @@ Core and Builtins
Library Library
------- -------
- Issue #11659: Fix ResourceWarning in test_subprocess introduced by #11459.
Patch by Ben Hayden.
- Issue #11635: Don't use polling in worker threads and processes launched by - Issue #11635: Don't use polling in worker threads and processes launched by
concurrent.futures. concurrent.futures.