Skip to content

handle datetime in json_clean #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rgbkrk merged 1 commit into from
May 27, 2015
Merged

handle datetime in json_clean #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ipykernel/jsonutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@ def json_clean(obj):
for k,v in iteritems(obj):
out[unicode_type(k)] = json_clean(v)
return out
if isinstance(obj, datetime):
return obj.strftime(ISO8601)

# we don't understand it, it's probably an unserializable object
raise ValueError("Can't clean for JSON: %r" % obj)
2 changes: 2 additions & 0 deletions ipykernel/tests/test_jsonutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import json
from base64 import decodestring
from datetime import datetime

import nose.tools as nt

Expand Down Expand Up @@ -37,6 +38,7 @@ def test():
((x for x in range(3)), [0, 1, 2]),
(iter([1, 2]), [1, 2]),
(Int(5), 5),
(datetime(1991, 7, 3, 12, 00), "1991-07-03T12:00:00.000000"),
]

for val, jval in pairs:
Expand Down