openstack/taskflow
Code Issues Proposed changes

Merge "Bring in a newer optional eventlet"

Browse Source
This commit is contained in:
Jenkins 2014-10-18 19:38:32 +00:00 committed by Gerrit Code Review
commit e5f1a0ecfa
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
taskflow/utils/eventlet_utils.py
View File

@ -144,9 +144,7 @@ class GreenExecutor(futures.Executor):
self._shutdown = True
if wait:
self._pool.waitall()
# NOTE(harlowja): Fixed in eventlet 0.15 (remove when able to use)
if not self._delayed_work.empty():
self._delayed_work.join()
self._delayed_work.join()
class _GreenWaiter(object):

4
tox.ini
View File

@ -65,14 +65,14 @@ basepython = python2.6
deps = {[testenv]deps}
-r{toxinidir}/requirements-py2.txt
MySQL-python
eventlet>=0.13.0
eventlet>=0.15.1
SQLAlchemy>=0.7.8,<=0.7.99
[testenv:py27]
deps = {[testenv]deps}
-r{toxinidir}/requirements-py2.txt
MySQL-python
eventlet>=0.13.0
eventlet>=0.15.1
SQLAlchemy>=0.7.8,<=0.9.99
doc8
commands =