Use newer location for iso8601 UTC
Newer versions have moved from iso8601.iso8601.Utc() to just iso8601.UTC. Change-Id: Iecdf6d136f0bfb6ff6f7a126634d717ce560c58e Closes-Bug:#1715486
This commit is contained in:
parent
4978f34055
commit
09727efe9e
|
@ -38,7 +38,7 @@ def datetime_or_none(dt):
|
||||||
# NOTE(danms): Legacy objects from sqlalchemy are stored in UTC,
|
# NOTE(danms): Legacy objects from sqlalchemy are stored in UTC,
|
||||||
# but are returned without a timezone attached.
|
# but are returned without a timezone attached.
|
||||||
# As a transitional aid, assume a tz-naive object is in UTC.
|
# 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:
|
else:
|
||||||
return dt
|
return dt
|
||||||
raise ValueError(_("A datetime.datetime is required here"))
|
raise ValueError(_("A datetime.datetime is required here"))
|
||||||
|
@ -143,4 +143,4 @@ def obj_serializer(name):
|
||||||
return getattr(self, name).obj_to_primitive()
|
return getattr(self, name).obj_to_primitive()
|
||||||
else:
|
else:
|
||||||
return None
|
return None
|
||||||
return serializer
|
return serializer
|
||||||
|
|
|
@ -23,9 +23,9 @@ import six
|
||||||
def compare_dates(datetime1, datetime2):
|
def compare_dates(datetime1, datetime2):
|
||||||
"""Compare datetime objects."""
|
"""Compare datetime objects."""
|
||||||
if datetime1 is not None and datetime1.utcoffset() is None:
|
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:
|
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
|
return datetime1 == datetime2
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue