From 67b318add1eb4e9373924e81cdee82048d5b78ec Mon Sep 17 00:00:00 2001 From: Kevin Houdebert Date: Fri, 7 Aug 2015 16:49:55 +0200 Subject: [PATCH] Bump monotonic to 0.3 to remove exception catching on import Related-Bug: 1476588 Depends-on: Ia3d4b01b665c8d97161164c89b1c92a5eb61d5b2 Change-Id: Iab6cc15f7871c25cf93c8fed1bd46773563a026e --- oslo_utils/timeutils.py | 8 +------- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/oslo_utils/timeutils.py b/oslo_utils/timeutils.py index bc5db0b3..47859a75 100644 --- a/oslo_utils/timeutils.py +++ b/oslo_utils/timeutils.py @@ -23,13 +23,7 @@ import time from debtcollector import removals import iso8601 -try: - from monotonic import monotonic as now # noqa -except RuntimeError: - try: - now = time.monotonic - except AttributeError: - now = time.time +from monotonic import monotonic as now # noqa from pytz import timezone import six diff --git a/requirements.txt b/requirements.txt index 2ad59867..586e6329 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ Babel>=1.3 six>=1.9.0 iso8601>=0.1.9 oslo.i18n>=1.5.0 # Apache-2.0 -monotonic>=0.1 # Apache-2.0 +monotonic>=0.3 # Apache-2.0 pytz>=2013.6 netaddr>=0.7.12 netifaces>=0.10.4