From 09727efe9e137bbafdb254879bbe4f8a2dd8e3e4 Mon Sep 17 00:00:00 2001 From: zhangyangyang Date: Fri, 8 Sep 2017 18:11:36 +0800 Subject: [PATCH] Use newer location for iso8601 UTC Newer versions have moved from iso8601.iso8601.Utc() to just iso8601.UTC. Change-Id: Iecdf6d136f0bfb6ff6f7a126634d717ce560c58e Closes-Bug:#1715486 --- cue/objects/utils.py | 4 ++-- cue/tests/utils.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cue/objects/utils.py b/cue/objects/utils.py index 5db09696..8095deb8 100644 --- a/cue/objects/utils.py +++ b/cue/objects/utils.py @@ -38,7 +38,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")) @@ -143,4 +143,4 @@ def obj_serializer(name): return getattr(self, name).obj_to_primitive() else: return None - return serializer \ No newline at end of file + return serializer diff --git a/cue/tests/utils.py b/cue/tests/utils.py index a49a6e6f..29ae408f 100644 --- a/cue/tests/utils.py +++ b/cue/tests/utils.py @@ -23,9 +23,9 @@ import six def compare_dates(datetime1, datetime2): """Compare datetime objects.""" if datetime1 is not None and datetime1.utcoffset() is None: - datetime1 = datetime1.replace(tzinfo=iso8601.iso8601.Utc()) + datetime1 = datetime1.replace(tzinfo=iso8601.UTC) if datetime2 is not None and datetime2.utcoffset() is None: - datetime2 = datetime2.replace(tzinfo=iso8601.iso8601.Utc()) + datetime2 = datetime2.replace(tzinfo=iso8601.UTC) return datetime1 == datetime2