Kaydet (Commit) d44a4a27 authored tarafından Richard Oudkerk's avatar Richard Oudkerk

Issue #12157: pool.map() does not handle empty iterable correctly

Initial patch by mouad
üst 0a09f3e2
...@@ -576,6 +576,7 @@ class MapResult(ApplyResult): ...@@ -576,6 +576,7 @@ class MapResult(ApplyResult):
if chunksize <= 0: if chunksize <= 0:
self._number_left = 0 self._number_left = 0
self._ready = True self._ready = True
del cache[self._job]
else: else:
self._number_left = length//chunksize + bool(length % chunksize) self._number_left = length//chunksize + bool(length % chunksize)
......
...@@ -1152,6 +1152,18 @@ class _TestPool(BaseTestCase): ...@@ -1152,6 +1152,18 @@ class _TestPool(BaseTestCase):
join() join()
self.assertTrue(join.elapsed < 0.2) self.assertTrue(join.elapsed < 0.2)
def test_empty_iterable(self):
# See Issue 12157
p = self.Pool(1)
self.assertEqual(p.map(sqr, []), [])
self.assertEqual(list(p.imap(sqr, [])), [])
self.assertEqual(list(p.imap_unordered(sqr, [])), [])
self.assertEqual(p.map_async(sqr, []).get(), [])
p.close()
p.join()
def unpickleable_result(): def unpickleable_result():
return lambda: 42 return lambda: 42
...@@ -2113,7 +2125,7 @@ class ProcessesMixin(object): ...@@ -2113,7 +2125,7 @@ class ProcessesMixin(object):
'Queue', 'Lock', 'RLock', 'Semaphore', 'BoundedSemaphore', 'Queue', 'Lock', 'RLock', 'Semaphore', 'BoundedSemaphore',
'Condition', 'Event', 'Value', 'Array', 'RawValue', 'Condition', 'Event', 'Value', 'Array', 'RawValue',
'RawArray', 'current_process', 'active_children', 'Pipe', 'RawArray', 'current_process', 'active_children', 'Pipe',
'connection', 'JoinableQueue' 'connection', 'JoinableQueue', 'Pool'
))) )))
testcases_processes = create_test_cases(ProcessesMixin, type='processes') testcases_processes = create_test_cases(ProcessesMixin, type='processes')
...@@ -2127,7 +2139,7 @@ class ManagerMixin(object): ...@@ -2127,7 +2139,7 @@ class ManagerMixin(object):
locals().update(get_attributes(manager, ( locals().update(get_attributes(manager, (
'Queue', 'Lock', 'RLock', 'Semaphore', 'BoundedSemaphore', 'Queue', 'Lock', 'RLock', 'Semaphore', 'BoundedSemaphore',
'Condition', 'Event', 'Value', 'Array', 'list', 'dict', 'Condition', 'Event', 'Value', 'Array', 'list', 'dict',
'Namespace', 'JoinableQueue' 'Namespace', 'JoinableQueue', 'Pool'
))) )))
testcases_manager = create_test_cases(ManagerMixin, type='manager') testcases_manager = create_test_cases(ManagerMixin, type='manager')
...@@ -2141,7 +2153,7 @@ class ThreadsMixin(object): ...@@ -2141,7 +2153,7 @@ class ThreadsMixin(object):
'Queue', 'Lock', 'RLock', 'Semaphore', 'BoundedSemaphore', 'Queue', 'Lock', 'RLock', 'Semaphore', 'BoundedSemaphore',
'Condition', 'Event', 'Value', 'Array', 'current_process', 'Condition', 'Event', 'Value', 'Array', 'current_process',
'active_children', 'Pipe', 'connection', 'dict', 'list', 'active_children', 'Pipe', 'connection', 'dict', 'list',
'Namespace', 'JoinableQueue' 'Namespace', 'JoinableQueue', 'Pool'
))) )))
testcases_threads = create_test_cases(ThreadsMixin, type='threads') testcases_threads = create_test_cases(ThreadsMixin, type='threads')
......
...@@ -67,6 +67,9 @@ Core and Builtins ...@@ -67,6 +67,9 @@ Core and Builtins
Library Library
------- -------
- Issue #12157: Make pool.map() empty iterables correctly. Initial
patch by mouad.
- Issue #14962: Update text coloring in IDLE shell window after changing - Issue #14962: Update text coloring in IDLE shell window after changing
options. Patch by Roger Serwy. options. Patch by Roger Serwy.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment