openstack/glance
Code Issues Proposed changes

Merge "Port _validate_time() to Python 3"

Browse Source
This commit is contained in:
Jenkins 2015-12-01 04:20:51 +00:00 committed by Gerrit Code Review
commit 9626c73ea6
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glance/api/v1/images.py
View File

@ -78,6 +78,12 @@ def _validate_time(req, values):
if time_field in values and values[time_field]: if time_field in values and values[time_field]:
try: try:
time = timeutils.parse_isotime(values[time_field]) time = timeutils.parse_isotime(values[time_field])
# On Python 2, datetime.datetime.strftime() raises a ValueError
# for years older than 1900. On Python 3, years older than 1900
# are accepted. But we explicitly want to reject timestamps
# older than January 1st, 1900 for Glance API v1.
if time.year < 1900:
raise ValueError
values[time_field] = time.strftime( values[time_field] = time.strftime(
timeutils.PERFECT_TIME_FORMAT) timeutils.PERFECT_TIME_FORMAT)
except ValueError: except ValueError: