From c46c436ba6b672f4b58cf135717551e54ac65afd Mon Sep 17 00:00:00 2001 From: Albert White Date: Tue, 21 Jul 2015 11:06:19 +0100 Subject: [PATCH] Adding checking around the monotonic import Change-Id: I88c05ecf7ce0caade4ff00630c65c9b7eb690fbd Closes-Bug: 1476588 --- oslo_utils/timeutils.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/oslo_utils/timeutils.py b/oslo_utils/timeutils.py index 47859a75..bc5db0b3 100644 --- a/oslo_utils/timeutils.py +++ b/oslo_utils/timeutils.py @@ -23,7 +23,13 @@ import time from debtcollector import removals import iso8601 -from monotonic import monotonic as now # noqa +try: + from monotonic import monotonic as now # noqa +except RuntimeError: + try: + now = time.monotonic + except AttributeError: + now = time.time from pytz import timezone import six