openstack
/
nova
Code Issues Proposed changes

Merge "Handle TZ change in iso8601 >=0.1.12"

This commit is contained in:
Zuul 2018-01-31 00:36:50 +00:00 committed by Gerrit Code Review
parent 64c452d568 11222bbf77
commit 27375b7515
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/utils.py
View File

@ -1253,7 +1253,7 @@ def isotime(at=None):
at = timeutils.utcnow()
date_string = at.strftime("%Y-%m-%dT%H:%M:%S")
tz = at.tzinfo.tzname(None) if at.tzinfo else 'UTC'
date_string += ('Z' if tz == 'UTC' else tz)
date_string += ('Z' if tz in ['UTC', 'UTC+00:00'] else tz)
return date_string