Merge "Update all removal_version from being ? to being 2.0"

This commit is contained in:
Jenkins
2015-07-13 05:05:21 +00:00
committed by Gerrit Code Review
8 changed files with 12 additions and 12 deletions

View File

@@ -83,7 +83,7 @@ class BlockingConductor(base.Conductor):
raise ValueError("Invalid timeout literal: %s" % (wait_timeout)) raise ValueError("Invalid timeout literal: %s" % (wait_timeout))
self._dead = threading.Event() self._dead = threading.Event()
@removals.removed_kwarg('timeout', version="0.8", removal_version="?") @removals.removed_kwarg('timeout', version="0.8", removal_version="2.0")
def stop(self, timeout=None): def stop(self, timeout=None):
"""Requests the conductor to stop dispatching. """Requests the conductor to stop dispatching.

View File

@@ -22,7 +22,7 @@ from taskflow.conductors.backends import impl_blocking
# TODO(harlowja): remove this module soon... # TODO(harlowja): remove this module soon...
removals.removed_module(__name__, removals.removed_module(__name__,
replacement="the conductor entrypoints", replacement="the conductor entrypoints",
version="0.8", removal_version="?", version="0.8", removal_version="2.0",
stacklevel=4) stacklevel=4)
# TODO(harlowja): remove this proxy/legacy class soon... # TODO(harlowja): remove this proxy/legacy class soon...

View File

@@ -55,7 +55,7 @@ class Engine(object):
@property @property
@moves.moved_property('atom_notifier', version="0.6", @moves.moved_property('atom_notifier', version="0.6",
removal_version="?") removal_version="2.0")
def task_notifier(self): def task_notifier(self):
"""The task notifier. """The task notifier.
@@ -128,4 +128,4 @@ class Engine(object):
# TODO(harlowja): remove in 0.7 or later... # TODO(harlowja): remove in 0.7 or later...
EngineBase = moves.moved_class(Engine, 'EngineBase', __name__, EngineBase = moves.moved_class(Engine, 'EngineBase', __name__,
version="0.6", removal_version="?") version="0.6", removal_version="2.0")

View File

@@ -92,7 +92,7 @@ def _extract_engine(**kwargs):
stacklevel = sum(1 for _frame in finder) stacklevel = sum(1 for _frame in finder)
decorator = renames.renamed_kwarg('engine_conf', 'engine', decorator = renames.renamed_kwarg('engine_conf', 'engine',
version="0.6", version="0.6",
removal_version="?", removal_version="2.0",
# Three is added on since the # Three is added on since the
# decorator adds three of its own # decorator adds three of its own
# stack levels that we need to # stack levels that we need to

View File

@@ -166,7 +166,7 @@ class Listener(object):
# TODO(harlowja): remove in 0.7 or later... # TODO(harlowja): remove in 0.7 or later...
ListenerBase = moves.moved_class(Listener, 'ListenerBase', __name__, ListenerBase = moves.moved_class(Listener, 'ListenerBase', __name__,
version="0.6", removal_version="?") version="0.6", removal_version="2.0")
@six.add_metaclass(abc.ABCMeta) @six.add_metaclass(abc.ABCMeta)
@@ -213,7 +213,7 @@ class DumpingListener(Listener):
# TODO(harlowja): remove in 0.7 or later... # TODO(harlowja): remove in 0.7 or later...
class LoggingBase(moves.moved_class(DumpingListener, class LoggingBase(moves.moved_class(DumpingListener,
'LoggingBase', __name__, 'LoggingBase', __name__,
version="0.6", removal_version="?")): version="0.6", removal_version="2.0")):
"""Legacy logging base. """Legacy logging base.

View File

@@ -91,7 +91,7 @@ class DurationListener(base.Listener):
TimingListener = moves.moved_class(DurationListener, TimingListener = moves.moved_class(DurationListener,
'TimingListener', __name__, 'TimingListener', __name__,
version="0.8", removal_version="?") version="0.8", removal_version="2.0")
class PrintingDurationListener(DurationListener): class PrintingDurationListener(DurationListener):
@@ -117,7 +117,7 @@ class PrintingDurationListener(DurationListener):
PrintingTimingListener = moves.moved_class( PrintingTimingListener = moves.moved_class(
PrintingDurationListener, 'PrintingTimingListener', __name__, PrintingDurationListener, 'PrintingTimingListener', __name__,
version="0.8", removal_version="?") version="0.8", removal_version="2.0")
class EventTimeListener(base.Listener): class EventTimeListener(base.Listener):

View File

@@ -193,7 +193,7 @@ class FakeFilesystem(object):
return [selector_func(node, child_node) return [selector_func(node, child_node)
for child_node in node.bfs_iter()] for child_node in node.bfs_iter()]
@removals.removed_kwarg('recursive', version="0.11", removal_version="?") @removals.removed_kwarg('recursive', version="0.11", removal_version="2.0")
def ls(self, path, recursive=False): def ls(self, path, recursive=False):
"""Return list of all children of the given path. """Return list of all children of the given path.

View File

@@ -505,12 +505,12 @@ def ensure_tree(path):
Failure = deprecation.moved_proxy_class(failure.Failure, Failure = deprecation.moved_proxy_class(failure.Failure,
'Failure', __name__, 'Failure', __name__,
version="0.6", removal_version="?") version="0.6", removal_version="2.0")
Notifier = deprecation.moved_proxy_class(notifier.Notifier, Notifier = deprecation.moved_proxy_class(notifier.Notifier,
'Notifier', __name__, 'Notifier', __name__,
version="0.6", removal_version="?") version="0.6", removal_version="2.0")
@contextlib.contextmanager @contextlib.contextmanager