diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-29 15:41:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-29 15:41:07 +0000 |
| commit | 27baaf46ad1aa4647729b4050d4bc17394b944b6 (patch) | |
| tree | 126ba0c96dd57f25099c02ec0610f1f160df7470 /taskflow/conductors | |
| parent | 766978c68e9346b972f84c7dc417678260b933b3 (diff) | |
| parent | 543cf78a6f26fe4929b53a7bfb9cbdc5f2624fbd (diff) | |
| download | taskflow-27baaf46ad1aa4647729b4050d4bc17394b944b6.tar.gz | |
Merge "Remove 2.6 classifier + 2.6 compatibility code"
Diffstat (limited to 'taskflow/conductors')
| -rw-r--r-- | taskflow/conductors/backends/impl_blocking.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/taskflow/conductors/backends/impl_blocking.py b/taskflow/conductors/backends/impl_blocking.py index 895f7d3..a62d121 100644 --- a/taskflow/conductors/backends/impl_blocking.py +++ b/taskflow/conductors/backends/impl_blocking.py @@ -12,6 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. +import threading + try: from contextlib import ExitStack # noqa except ImportError: @@ -26,7 +28,6 @@ from taskflow.listeners import logging as logging_listener from taskflow import logging from taskflow.types import timing as tt from taskflow.utils import async_utils -from taskflow.utils import threading_utils LOG = logging.getLogger(__name__) WAIT_TIMEOUT = 0.5 @@ -69,7 +70,7 @@ class BlockingConductor(base.Conductor): self._wait_timeout = wait_timeout else: raise ValueError("Invalid timeout literal: %s" % (wait_timeout)) - self._dead = threading_utils.Event() + self._dead = threading.Event() @removals.removed_kwarg('timeout', version="0.8", removal_version="?") def stop(self, timeout=None): |