Merge "Remove class StopWatch from timing"

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

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.