Skip to content

format dates as ISO8601 #1057

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
blink1073 merged 8 commits into from
Dec 14, 2022
Merged

format dates as ISO8601 #1057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9a60d8d
format dates as ISO8601
GRcharles Dec 14, 2022
b179556
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 14, 2022
6a57d6e
Update test_jsonutil.py
GRcharles Dec 14, 2022
c09a681
Update jsonutil.py
GRcharles Dec 14, 2022
07e8117
Update test_jsonutil.py
GRcharles Dec 14, 2022
6eb4098
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 14, 2022
ebf389a
Update test_jsonutil.py
GRcharles Dec 14, 2022
d55d60a
fix date test
GRcharles Dec 14, 2022
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
4 changes: 2 additions & 2 deletions ipykernel/jsonutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import re
import types
from binascii import b2a_base64
from datetime import datetime
from datetime import date, datetime

from jupyter_client._version import version_info as jupyter_client_version

Expand Down Expand Up @@ -155,7 +155,7 @@ def json_clean(obj): # pragma: no cover
for k, v in obj.items():
out[str(k)] = json_clean(v)
return out
if isinstance(obj, datetime):
if isinstance(obj, datetime) or isinstance(obj, date):
return obj.strftime(ISO8601)

# we don't understand it, it's probably an unserializable object
Expand Down
3 changes: 2 additions & 1 deletion ipykernel/tests/test_jsonutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import json
import numbers
from binascii import a2b_base64
from datetime import datetime
from datetime import date, datetime

import pytest
from jupyter_client._version import version_info as jupyter_client_version
Expand Down Expand Up @@ -54,6 +54,7 @@ def test():
((x for x in range(3)), [0, 1, 2]),
(iter([1, 2]), [1, 2]),
(datetime(1991, 7, 3, 12, 00), "1991-07-03T12:00:00.000000"),
(date(1991, 7, 3), "1991-07-03T00:00:00.000000"),
(MyFloat(), 3.14),
(MyInt(), 389),
]
Expand Down