starlingx
/
config
Code Issues Proposed changes

Merge "Fix Python3 iso8601 UTC change"

This commit is contained in:
Zuul 2019-03-15 20:01:01 +00:00 committed by Gerrit Code Review
parent 56ced8cfa0 c9d66fb5f4
commit 59d25eed6f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sysinv/sysinv/sysinv/sysinv/objects/utils.py
View File

@ -39,7 +39,7 @@ def datetime_or_none(dt):
# NOTE(danms): Legacy objects from sqlalchemy are stored in UTC,
# but are returned without a timezone attached.
# As a transitional aid, assume a tz-naive object is in UTC.
return dt.replace(tzinfo=iso8601.iso8601.Utc())
return dt.replace(tzinfo=iso8601.UTC)
else:
return dt
raise ValueError('A datetime.datetime is required here')

2
sysinv/sysinv/sysinv/sysinv/tests/objects/test_objects.py
View File

@ -123,7 +123,7 @@ class TestUtils(test_base.TestCase):
dt = timeutils.parse_isotime(timeutils.isotime(naive_dt))
self.assertEqual(utils.datetime_or_none(dt), dt)
self.assertEqual(utils.datetime_or_none(dt),
naive_dt.replace(tzinfo=iso8601.iso8601.Utc(),
naive_dt.replace(tzinfo=iso8601.UTC,
microsecond=0))
self.assertEqual(utils.datetime_or_none(None), None)
self.assertRaises(ValueError, utils.datetime_or_none, 'foo')