Handle TZ change in iso8601 >=0.1.12

The iso8601 lib introduced a change such that if running on python
3.2 or later it internally uses the python timezone information
instead of its own implementation. This does not change direct
date handling, but when converting this value there is a slight
difference where now python 2.x will show UTC times as "UTC", but
on python 3 they will end up with "UTC+00:00".

The to_primitive call for DateTime fields was doing an exact match
on "UTC" to determine whether to include "Z" in the resulting string.
This updates that handling to recognize either of the new values.

Change-Id: Idfefd41e45727a375a5ea296a3348716c43f17b5
Closes-bug: #1744160
This commit is contained in:
junboli 2018-01-22 09:28:42 +08:00 committed by Sean McGinnis
parent a367042187
commit d24963f7e8
1 changed files with 2 additions and 1 deletions

View File

@ -282,7 +282,8 @@ def time_format(at=None):
at = timeutils.utcnow()
date_string = at.strftime("%Y-%m-%dT%H:%M:%S")
tz = at.tzname(None) if at.tzinfo else 'UTC'
date_string += ('Z' if tz == 'UTC' else tz)
# Need to handle either iso8601 or python UTC format
date_string += ('Z' if tz in ['UTC', 'UTC+00:00'] else tz)
return date_string