Skip to content

Commit 097bc45

Browse files
committed
Merge pull request #18 from minrk/datetime
handle datetime in json_clean
2 parents 2d98e8f + 14aadd6 commit 097bc45

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

ipykernel/jsonutil.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ def json_clean(obj):
162162
for k,v in iteritems(obj):
163163
out[unicode_type(k)] = json_clean(v)
164164
return out
165+
if isinstance(obj, datetime):
166+
return obj.strftime(ISO8601)
165167

166168
# we don't understand it, it's probably an unserializable object
167169
raise ValueError("Can't clean for JSON: %r" % obj)

ipykernel/tests/test_jsonutil.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import json
88
from base64 import decodestring
9+
from datetime import datetime
910

1011
import nose.tools as nt
1112

@@ -37,6 +38,7 @@ def test():
3738
((x for x in range(3)), [0, 1, 2]),
3839
(iter([1, 2]), [1, 2]),
3940
(Int(5), 5),
41+
(datetime(1991, 7, 3, 12, 00), "1991-07-03T12:00:00.000000"),
4042
]
4143

4244
for val, jval in pairs:

0 commit comments

Comments
 (0)