openstack
/
oslo.utils
Code Issues Proposed changes

Merge "Don't use monotonic on Python >=3.3"

This commit is contained in:
Zuul 2018-12-13 11:31:12 +00:00 committed by Gerrit Code Review
parent e67579790e d7e70b11c6
commit 382370781b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oslo_utils/timeutils.py
View File

@ -24,12 +24,16 @@ import time
from debtcollector import removals
import iso8601
from monotonic import monotonic as now # noqa
import pytz
import six
from oslo_utils import reflection
if hasattr(time, 'monotonic'):
now = time.monotonic
else:
from monotonic import monotonic as now # noqa
# ISO 8601 extended time format with microseconds
_ISO8601_TIME_FORMAT_SUBSECOND = '%Y-%m-%dT%H:%M:%S.%f'
_ISO8601_TIME_FORMAT = '%Y-%m-%dT%H:%M:%S'

2
requirements.txt
View File

@ -12,7 +12,7 @@ six>=1.10.0 # MIT
funcsigs>=1.0.0;python_version=='2.7' or python_version=='2.6' # Apache-2.0
iso8601>=0.1.11 # MIT
oslo.i18n>=3.15.3 # Apache-2.0
monotonic>=0.6 # Apache-2.0
monotonic>=0.6;python_version<'3.3' # Apache-2.0
pytz>=2013.6 # MIT
netaddr>=0.7.18 # BSD
netifaces>=0.10.4 # MIT