From c9d66fb5f42cfb3c7d63c75798d7e156741e193b Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Fri, 15 Mar 2019 11:41:43 -0500 Subject: [PATCH] Fix Python3 iso8601 UTC change Python 3 changed the iso8601 module iso8601.iso8601.Utc() function to iso8601.UTC. This is compatible with Python2.7. Change-Id: I886c1408a227dd0cc37faeab48738157c9c931cb Signed-off-by: Dean Troyer --- sysinv/sysinv/sysinv/sysinv/objects/utils.py | 2 +- sysinv/sysinv/sysinv/sysinv/tests/objects/test_objects.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sysinv/sysinv/sysinv/sysinv/objects/utils.py b/sysinv/sysinv/sysinv/sysinv/objects/utils.py index 199ba56a8b..66965da642 100644 --- a/sysinv/sysinv/sysinv/sysinv/objects/utils.py +++ b/sysinv/sysinv/sysinv/sysinv/objects/utils.py @@ -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') diff --git a/sysinv/sysinv/sysinv/sysinv/tests/objects/test_objects.py b/sysinv/sysinv/sysinv/sysinv/tests/objects/test_objects.py index 6023c7bd5c..020cadd47d 100644 --- a/sysinv/sysinv/sysinv/sysinv/tests/objects/test_objects.py +++ b/sysinv/sysinv/sysinv/sysinv/tests/objects/test_objects.py @@ -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')