From 7d79e5236653d159f7a8dd7423851b34373a7d1d Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@gmail.com>
Date: Fri, 20 Mar 2015 20:55:43 -0700
Subject: [PATCH] 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
---
 taskflow/conductors/backends/impl_blocking.py |  5 +--
 taskflow/conductors/single_threaded.py        |  9 +++--
 taskflow/types/periodic.py                    |  4 +-
 taskflow/utils/deprecation.py                 | 38 -------------------
 4 files changed, 9 insertions(+), 47 deletions(-)

diff --git a/taskflow/conductors/backends/impl_blocking.py b/taskflow/conductors/backends/impl_blocking.py
index b53452af..5156da10 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 c8ab5a03..e1fafcce 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(
diff --git a/taskflow/types/periodic.py b/taskflow/types/periodic.py
index 8be3e10d..7314988c 100644
--- a/taskflow/types/periodic.py
+++ b/taskflow/types/periodic.py
@@ -17,11 +17,11 @@
 import heapq
 import inspect
 
+from debtcollector import removals
 from oslo_utils import reflection
 import six
 
 from taskflow import logging
-from taskflow.utils import deprecation
 from taskflow.utils import misc
 from taskflow.utils import threading_utils as tu
 
@@ -143,7 +143,7 @@ class PeriodicWorker(object):
                         callables.append(member)
         return cls(callables)
 
-    @deprecation.removed_kwarg('tombstone', version="0.8", removal_version="?")
+    @removals.removed_kwarg('tombstone', version="0.8", removal_version="?")
     def __init__(self, callables, tombstone=None):
         if tombstone is None:
             self._tombstone = tu.Event()
diff --git a/taskflow/utils/deprecation.py b/taskflow/utils/deprecation.py
index 8bb48b27..9faf80cb 100644
--- a/taskflow/utils/deprecation.py
+++ b/taskflow/utils/deprecation.py
@@ -17,7 +17,6 @@
 import warnings
 
 from oslo_utils import reflection
-import six
 
 
 def deprecation(message, stacklevel=None):
@@ -131,43 +130,6 @@ def _generate_message(prefix, postfix=None, message=None,
     return ''.join(message_components)
 
 
-def removed_kwarg(old_name, message=None,
-                  version=None, removal_version=None, stacklevel=3):
-    """Decorates a kwarg accepting function to deprecate a removed kwarg."""
-
-    prefix = "Using the '%s' argument is deprecated" % old_name
-    out_message = _generate_message(prefix, postfix=None,
-                                    message=message, version=version,
-                                    removal_version=removal_version)
-
-    def decorator(f):
-
-        @six.wraps(f)
-        def wrapper(*args, **kwargs):
-            if old_name in kwargs:
-                deprecation(out_message, stacklevel=stacklevel)
-            return f(*args, **kwargs)
-
-        return wrapper
-
-    return decorator
-
-
-def removed_module(module_name, replacement_name=None, message=None,
-                   version=None, removal_version=None, stacklevel=4):
-    """Deprecates a module that will be removed/replaced in the future."""
-    prefix = "The '%s' module usage is deprecated" % module_name
-    if replacement_name:
-        postfix = ", please use %s instead" % replacement_name
-    else:
-        postfix = None
-    out_message = _generate_message(prefix,
-                                    postfix=postfix, message=message,
-                                    version=version,
-                                    removal_version=removal_version)
-    deprecation(out_message, stacklevel=stacklevel)
-
-
 def moved_proxy_class(new_class, old_class_name, old_module_name,
                       message=None, version=None, removal_version=None,
                       stacklevel=3):