From 9a60d8d18cd9289b6e8fc15539cee3d0433c98b0 Mon Sep 17 00:00:00 2001 From: GRcharles <115260549+GRcharles@users.noreply.github.com> Date: Wed, 14 Dec 2022 13:15:13 +0000 Subject: [PATCH 1/8] format dates as ISO8601 format dates as ISO8601 - currently works for datetimes, but not dates. Follow up to https://github.com/ipython/ipykernel/pull/18 --- ipykernel/jsonutil.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ipykernel/jsonutil.py b/ipykernel/jsonutil.py index a60032d30..32375c54c 100644 --- a/ipykernel/jsonutil.py +++ b/ipykernel/jsonutil.py @@ -155,8 +155,9 @@ 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 raise ValueError("Can't clean for JSON: %r" % obj) From b17955625e49f1a6c60ef5809134f20932ab804c Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 14 Dec 2022 13:15:46 +0000 Subject: [PATCH 2/8] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- ipykernel/jsonutil.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ipykernel/jsonutil.py b/ipykernel/jsonutil.py index 32375c54c..db61e42d0 100644 --- a/ipykernel/jsonutil.py +++ b/ipykernel/jsonutil.py @@ -157,7 +157,6 @@ def json_clean(obj): # pragma: no cover return out if isinstance(obj, datetime) or isinstance(obj, date): return obj.strftime(ISO8601) - # we don't understand it, it's probably an unserializable object raise ValueError("Can't clean for JSON: %r" % obj) From 6a57d6edc6082196374e1127767e036e26e3a279 Mon Sep 17 00:00:00 2001 From: GRcharles <115260549+GRcharles@users.noreply.github.com> Date: Wed, 14 Dec 2022 13:16:26 +0000 Subject: [PATCH 3/8] Update test_jsonutil.py --- ipykernel/tests/test_jsonutil.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ipykernel/tests/test_jsonutil.py b/ipykernel/tests/test_jsonutil.py index 8fdb35495..160385b6c 100644 --- a/ipykernel/tests/test_jsonutil.py +++ b/ipykernel/tests/test_jsonutil.py @@ -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, 12, 00), "1991-07-03T12:00:00.000000"), (MyFloat(), 3.14), (MyInt(), 389), ] From c09a681ed472f864cb7d4ea2bf23585dd160144a Mon Sep 17 00:00:00 2001 From: GRcharles <115260549+GRcharles@users.noreply.github.com> Date: Wed, 14 Dec 2022 13:17:02 +0000 Subject: [PATCH 4/8] Update jsonutil.py --- ipykernel/jsonutil.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ipykernel/jsonutil.py b/ipykernel/jsonutil.py index db61e42d0..9143aa2f8 100644 --- a/ipykernel/jsonutil.py +++ b/ipykernel/jsonutil.py @@ -8,7 +8,7 @@ import re import types from binascii import b2a_base64 -from datetime import datetime +from datetime import datetime, date from jupyter_client._version import version_info as jupyter_client_version From 07e811721f1d75c3b673bf22ed710fdd82f75aea Mon Sep 17 00:00:00 2001 From: GRcharles <115260549+GRcharles@users.noreply.github.com> Date: Wed, 14 Dec 2022 13:17:12 +0000 Subject: [PATCH 5/8] Update test_jsonutil.py --- ipykernel/tests/test_jsonutil.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ipykernel/tests/test_jsonutil.py b/ipykernel/tests/test_jsonutil.py index 160385b6c..3db59b551 100644 --- a/ipykernel/tests/test_jsonutil.py +++ b/ipykernel/tests/test_jsonutil.py @@ -6,7 +6,7 @@ import json import numbers from binascii import a2b_base64 -from datetime import datetime +from datetime import datetime, date import pytest from jupyter_client._version import version_info as jupyter_client_version From 6eb4098c42139f8dfb84f43c83d6f3527e4117fe Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 14 Dec 2022 13:17:14 +0000 Subject: [PATCH 6/8] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- ipykernel/jsonutil.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ipykernel/jsonutil.py b/ipykernel/jsonutil.py index 9143aa2f8..41f63ac5b 100644 --- a/ipykernel/jsonutil.py +++ b/ipykernel/jsonutil.py @@ -8,7 +8,7 @@ import re import types from binascii import b2a_base64 -from datetime import datetime, date +from datetime import date, datetime from jupyter_client._version import version_info as jupyter_client_version From ebf389a328553a780c8ecc5401fab896380d21f5 Mon Sep 17 00:00:00 2001 From: GRcharles <115260549+GRcharles@users.noreply.github.com> Date: Wed, 14 Dec 2022 13:21:46 +0000 Subject: [PATCH 7/8] Update test_jsonutil.py --- ipykernel/tests/test_jsonutil.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ipykernel/tests/test_jsonutil.py b/ipykernel/tests/test_jsonutil.py index 3db59b551..22f31b5e0 100644 --- a/ipykernel/tests/test_jsonutil.py +++ b/ipykernel/tests/test_jsonutil.py @@ -6,7 +6,7 @@ import json import numbers from binascii import a2b_base64 -from datetime import datetime, date +from datetime import date, datetime import pytest from jupyter_client._version import version_info as jupyter_client_version From d55d60a38a401750714c0e2e41b94089d46b6368 Mon Sep 17 00:00:00 2001 From: GRcharles <115260549+GRcharles@users.noreply.github.com> Date: Wed, 14 Dec 2022 15:15:05 +0000 Subject: [PATCH 8/8] fix date test --- ipykernel/tests/test_jsonutil.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ipykernel/tests/test_jsonutil.py b/ipykernel/tests/test_jsonutil.py index 22f31b5e0..0189bc83b 100644 --- a/ipykernel/tests/test_jsonutil.py +++ b/ipykernel/tests/test_jsonutil.py @@ -54,7 +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, 12, 00), "1991-07-03T12:00:00.000000"), + (date(1991, 7, 3), "1991-07-03T00:00:00.000000"), (MyFloat(), 3.14), (MyInt(), 389), ]