#18741: merge with 3.3.

This commit is contained in:
Ezio Melotti 2013-08-17 16:13:22 +03:00
commit e0c69161bc
22 changed files with 38 additions and 36 deletions

View file

@ -301,7 +301,7 @@ def _check_system_limits():
# sysconf not available or setting not available
return
if nsems_max == -1:
# indetermine limit, assume that limit is determined
# indetermined limit, assume that limit is determined
# by available memory only
return
if nsems_max >= 256:
@ -415,7 +415,7 @@ class ProcessPoolExecutor(_base.Executor):
self._result_queue.put(None)
if wait:
self._queue_management_thread.join()
# To reduce the risk of openning too many files, remove references to
# To reduce the risk of opening too many files, remove references to
# objects that use file descriptors.
self._queue_management_thread = None
self._call_queue = None