diff options
| author | Russell Bryant <rbryant@redhat.com> | 2012-07-16 10:30:25 -0400 |
|---|---|---|
| committer | Russell Bryant <rbryant@redhat.com> | 2012-07-16 10:39:44 -0400 |
| commit | ce3071437d1871f77c4d8573cbe5f4ea8c817650 (patch) | |
| tree | 5a9f6f292d96d94c762f7e3873d951e43903a47f /openstack | |
| parent | 2adaf2ffafdb67bd237578f094b78d15da17b772 (diff) | |
| download | oslo-ce3071437d1871f77c4d8573cbe5f4ea8c817650.tar.gz oslo-ce3071437d1871f77c4d8573cbe5f4ea8c817650.tar.xz oslo-ce3071437d1871f77c4d8573cbe5f4ea8c817650.zip | |
Use strtime() in to_primitive() for datetime objs.
This patch updates jsonutils.to_primitive() to use timeutils.strtime()
to convert a datimetime object to a string instead of just using str().
This ensures that we can easily convert the string back to a datetime
using timeutils.parse_strtime().
Required for the nova blueprint no-db-messaging.
Change-Id: I725b333695930e12e2832378102514326fec639c
Diffstat (limited to 'openstack')
| -rw-r--r-- | openstack/common/jsonutils.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/openstack/common/jsonutils.py b/openstack/common/jsonutils.py index 11b7e1e..6130a7f 100644 --- a/openstack/common/jsonutils.py +++ b/openstack/common/jsonutils.py @@ -39,6 +39,8 @@ import itertools import json import xmlrpclib +from openstack.common import timeutils + def to_primitive(value, convert_instances=False, level=0): """Convert a complex object into primitives. @@ -101,7 +103,7 @@ def to_primitive(value, convert_instances=False, level=0): level=level) return o elif isinstance(value, datetime.datetime): - return str(value) + return timeutils.strtime(value) elif hasattr(value, 'iteritems'): return to_primitive(dict(value.iteritems()), convert_instances=convert_instances, |