diff options
| author | Joshua Harlow <harlowja@gmail.com> | 2015-03-20 20:55:43 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@gmail.com> | 2015-03-20 21:00:11 -0700 |
| commit | 7d79e5236653d159f7a8dd7423851b34373a7d1d (patch) | |
| tree | 33d4bb17524135996dbb83bb74959baf004e2741 /taskflow/conductors | |
| parent | 6723a18427aeaa43540a1d47009782478d116c89 (diff) | |
| download | taskflow-7d79e5236653d159f7a8dd7423851b34373a7d1d.tar.gz | |
Move to the newer debtcollector provided functions
Use the debtcollector library provided variants of
these functions and remove our versions to avoid more
duplications.
Change-Id: I526789f44899afd284803b127bec5bb349d1aa2b
Diffstat (limited to 'taskflow/conductors')
| -rw-r--r-- | taskflow/conductors/backends/impl_blocking.py | 5 | ||||
| -rw-r--r-- | taskflow/conductors/single_threaded.py | 9 |
2 files changed, 7 insertions, 7 deletions
diff --git a/taskflow/conductors/backends/impl_blocking.py b/taskflow/conductors/backends/impl_blocking.py index b53452a..5156da1 100644 --- a/taskflow/conductors/backends/impl_blocking.py +++ b/taskflow/conductors/backends/impl_blocking.py @@ -12,6 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. +from debtcollector import removals import six from taskflow.conductors import base @@ -20,7 +21,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 deprecation from taskflow.utils import misc from taskflow.utils import threading_utils @@ -67,8 +67,7 @@ class BlockingConductor(base.Conductor): raise ValueError("Invalid timeout literal: %s" % (wait_timeout)) self._dead = threading_utils.Event() - @deprecation.removed_kwarg('timeout', - version="0.8", removal_version="?") + @removals.removed_kwarg('timeout', version="0.8", removal_version="?") def stop(self, timeout=None): """Requests the conductor to stop dispatching. diff --git a/taskflow/conductors/single_threaded.py b/taskflow/conductors/single_threaded.py index c8ab5a0..e1fafcc 100644 --- a/taskflow/conductors/single_threaded.py +++ b/taskflow/conductors/single_threaded.py @@ -15,14 +15,15 @@ # under the License. from debtcollector import moves +from debtcollector import removals from taskflow.conductors.backends import impl_blocking -from taskflow.utils import deprecation # TODO(harlowja): remove this module soon... -deprecation.removed_module(__name__, - replacement_name="the conductor entrypoints", - version="0.8", removal_version="?") +removals.removed_module(__name__, + replacement="the conductor entrypoints", + version="0.8", removal_version="?", + stacklevel=4) # TODO(harlowja): remove this proxy/legacy class soon... SingleThreadedConductor = moves.moved_class( |