summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-12-07 20:58:48 +0000
committerGerrit Code Review <review@openstack.org>2017-12-07 20:58:48 +0000
commit60f28477ec1861041f23accea445bfbe9ed4ed37 (patch)
tree6f876baebe21551ccaa8415d4945a098f4ab45ee
parentc987c5b3d0b97f265aa6fe250d19cda4f34567af (diff)
parentd0a2f8046251696e2f23a7689440b7b0f6e74f4d (diff)
downloadtaskflow-60f28477ec1861041f23accea445bfbe9ed4ed37.tar.gz
Merge "Remove class StopWatch from timing"3.0.0
-rw-r--r--taskflow/examples/99_bottles.py4
-rw-r--r--taskflow/types/timing.py6
2 files changed, 2 insertions, 8 deletions
diff --git a/taskflow/examples/99_bottles.py b/taskflow/examples/99_bottles.py
index 89ed6fb..ee337fb 100644
--- a/taskflow/examples/99_bottles.py
+++ b/taskflow/examples/99_bottles.py
@@ -37,8 +37,8 @@ from taskflow.patterns import linear_flow as lf
from taskflow.persistence import backends as persistence_backends
from taskflow.persistence import models
from taskflow import task
-from taskflow.types import timing
+from oslo_utils import timeutils
from oslo_utils import uuidutils
# Instructions!
@@ -122,7 +122,7 @@ def run_conductor(only_run_once=False):
print("Event '%s' has been received..." % event)
print("Details = %s" % details)
if event.endswith("_start"):
- w = timing.StopWatch()
+ w = timeutils.StopWatch()
w.start()
base_event = event[0:-len("_start")]
event_watches[base_event] = w
diff --git a/taskflow/types/timing.py b/taskflow/types/timing.py
index be379bd..a160f6e 100644
--- a/taskflow/types/timing.py
+++ b/taskflow/types/timing.py
@@ -16,14 +16,8 @@
import threading
-from debtcollector import moves
-from oslo_utils import timeutils
import six
-# TODO(harlowja): Keep alias class... around until 2.0 is released.
-StopWatch = moves.moved_class(timeutils.StopWatch, 'StopWatch', __name__,
- version="1.15", removal_version="2.0")
-
class Timeout(object):
"""An object which represents a timeout.