From ce3071437d1871f77c4d8573cbe5f4ea8c817650 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Mon, 16 Jul 2012 10:30:25 -0400 Subject: 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 --- tests/unit/test_jsonutils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/unit/test_jsonutils.py') diff --git a/tests/unit/test_jsonutils.py b/tests/unit/test_jsonutils.py index 9b987cd..4a18b77 100644 --- a/tests/unit/test_jsonutils.py +++ b/tests/unit/test_jsonutils.py @@ -54,15 +54,15 @@ class ToPrimitiveTestCase(unittest.TestCase): self.assertEquals(jsonutils.to_primitive({}), {}) def test_datetime(self): - x = datetime.datetime(1, 2, 3, 4, 5, 6, 7) + x = datetime.datetime(1920, 2, 3, 4, 5, 6, 7) self.assertEquals(jsonutils.to_primitive(x), - "0001-02-03 04:05:06.000007") + '1920-02-03T04:05:06.000007') def test_DateTime(self): x = xmlrpclib.DateTime() x.decode("19710203T04:05:06") self.assertEquals(jsonutils.to_primitive(x), - "1971-02-03 04:05:06") + '1971-02-03T04:05:06.000000') def test_iter(self): class IterClass(object): -- cgit