From d0a2f8046251696e2f23a7689440b7b0f6e74f4d Mon Sep 17 00:00:00 2001
From: chenghuiyu <yuchenghui@unionpay.com>
Date: Tue, 5 Sep 2017 11:54:09 +0800
Subject: [PATCH] Remove class StopWatch from timing

In new release timeutils.StopWatch can be used from oslo.uitls, so it was deprecated for removal in
timing.py

Change-Id: I138b8d276998a4ea2537966767cbd14f96daf757
Closes-Bug: #1715043
---
 taskflow/examples/99_bottles.py | 4 ++--
 taskflow/types/timing.py        | 6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/taskflow/examples/99_bottles.py b/taskflow/examples/99_bottles.py
index 89ed6fb37..ee337fbd5 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 be379bd9b..a160f6e56 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.