openstack/oslo.utils
Code Issues Proposed changes

Merge "Fix usage of "deprecated" markup in docstrings"

Browse Source
This commit is contained in:
Jenkins 2015-10-17 02:53:04 +00:00 committed by Gerrit Code Review
commit 6aa24675e8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
oslo_utils/timeutils.py
View File

@ -45,7 +45,7 @@ _MAX_DATETIME_SEC = 59
def isotime(at=None, subsecond=False): def isotime(at=None, subsecond=False):
"""Stringify time in ISO 8601 format. """Stringify time in ISO 8601 format.
.. deprecated:: > 1.5.0 .. deprecated:: 1.5.0
Use :func:`utcnow` and :func:`datetime.datetime.isoformat` instead. Use :func:`utcnow` and :func:`datetime.datetime.isoformat` instead.
""" """
if not at: if not at:
@ -77,14 +77,14 @@ def parse_isotime(timestr):
def strtime(at=None, fmt=PERFECT_TIME_FORMAT): def strtime(at=None, fmt=PERFECT_TIME_FORMAT):
"""Returns formatted utcnow. """Returns formatted utcnow.
.. deprecated:: > 1.5.0 .. deprecated:: 1.5.0
Use :func:`utcnow()`, :func:`datetime.datetime.isoformat` Use :func:`utcnow()`, :func:`datetime.datetime.isoformat`
or :func:`datetime.strftime` instead. or :func:`datetime.strftime` instead:
strtime() => utcnow().isoformat() * ``strtime()`` => ``utcnow().isoformat()``
strtime(fmt=...) => utcnow().strftime(fmt) * ``strtime(fmt=...)`` => ``utcnow().strftime(fmt)``
strtime(at) => at.isoformat() * ``strtime(at)`` => ``at.isoformat()``
strtime(at, fmt) => at.strftime(fmt) * ``strtime(at, fmt)`` => ``at.strftime(fmt)``
""" """
if not at: if not at:
at = utcnow() at = utcnow()
@ -171,7 +171,7 @@ def utcnow(with_timezone=False):
def iso8601_from_timestamp(timestamp, microsecond=False): def iso8601_from_timestamp(timestamp, microsecond=False):
"""Returns an iso8601 formatted date from timestamp. """Returns an iso8601 formatted date from timestamp.
.. deprecated:: > 1.5.0 .. deprecated:: 1.5.0
Use :func:`datetime.datetime.utcfromtimestamp` and Use :func:`datetime.datetime.utcfromtimestamp` and
:func:`datetime.datetime.isoformat` instead. :func:`datetime.datetime.isoformat` instead.
""" """