mirror of
https://github.com/python/cpython.git
synced 2025-08-04 17:08:35 +00:00
bpo-30301: Fix AttributeError when using SimpleQueue.empty() (#1601)
Under *spawn* and *forkserver* start methods, SimpleQueue.empty() could raise AttributeError due to not setting _poll in __setstate__.
This commit is contained in:
parent
0774e79b93
commit
6f75bc003a
3 changed files with 40 additions and 0 deletions
|
@ -337,6 +337,7 @@ class SimpleQueue(object):
|
|||
|
||||
def __setstate__(self, state):
|
||||
(self._reader, self._writer, self._rlock, self._wlock) = state
|
||||
self._poll = self._reader.poll
|
||||
|
||||
def get(self):
|
||||
with self._rlock:
|
||||
|
|
|
@ -3958,6 +3958,42 @@ class TestSemaphoreTracker(unittest.TestCase):
|
|||
self.assertRegex(err, expected)
|
||||
self.assertRegex(err, r'semaphore_tracker: %r: \[Errno' % name1)
|
||||
|
||||
class TestSimpleQueue(unittest.TestCase):
|
||||
|
||||
@classmethod
|
||||
def _test_empty(cls, queue, child_can_start, parent_can_continue):
|
||||
child_can_start.wait()
|
||||
# issue 30301, could fail under spawn and forkserver
|
||||
try:
|
||||
queue.put(queue.empty())
|
||||
queue.put(queue.empty())
|
||||
finally:
|
||||
parent_can_continue.set()
|
||||
|
||||
def test_empty(self):
|
||||
queue = multiprocessing.SimpleQueue()
|
||||
child_can_start = multiprocessing.Event()
|
||||
parent_can_continue = multiprocessing.Event()
|
||||
|
||||
proc = multiprocessing.Process(
|
||||
target=self._test_empty,
|
||||
args=(queue, child_can_start, parent_can_continue)
|
||||
)
|
||||
proc.daemon = True
|
||||
proc.start()
|
||||
|
||||
self.assertTrue(queue.empty())
|
||||
|
||||
child_can_start.set()
|
||||
parent_can_continue.wait()
|
||||
|
||||
self.assertFalse(queue.empty())
|
||||
self.assertEqual(queue.get(), True)
|
||||
self.assertEqual(queue.get(), False)
|
||||
self.assertTrue(queue.empty())
|
||||
|
||||
proc.join()
|
||||
|
||||
#
|
||||
# Mixins
|
||||
#
|
||||
|
|
|
@ -323,6 +323,9 @@ Extension Modules
|
|||
Library
|
||||
-------
|
||||
|
||||
- bpo-30301: Fix AttributeError when using SimpleQueue.empty() under
|
||||
*spawn* and *forkserver* start methods.
|
||||
|
||||
- bpo-30375: Warnings emitted when compile a regular expression now always
|
||||
point to the line in the user code. Previously they could point into inners
|
||||
of the re module if emitted from inside of groups or conditionals.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue