From 7f5c53c10e212fbeb39f2f9df2b110a83c8888f0 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Fri, 15 Oct 2021 01:30:22 +0300 Subject: [PATCH] ui: write_json: don't forget json kwargs (#6810) Regression from #6743 Fixes #6803 --- dvc/ui/__init__.py | 2 +- tests/unit/ui/test_console.py | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dvc/ui/__init__.py b/dvc/ui/__init__.py index f91e87c69..5ba189f7a 100644 --- a/dvc/ui/__init__.py +++ b/dvc/ui/__init__.py @@ -98,7 +98,7 @@ class Console: text.overflow = None return self.write(text, styled=True) - return self.write(json.dumps(data)) + return self.write(json.dumps(data, default=default)) def write( self, diff --git a/tests/unit/ui/test_console.py b/tests/unit/ui/test_console.py index 237e4bca9..7f72e6712 100644 --- a/tests/unit/ui/test_console.py +++ b/tests/unit/ui/test_console.py @@ -1,3 +1,4 @@ +import datetime import textwrap import pytest @@ -27,7 +28,8 @@ def test_write(capsys: CaptureFixture[str]): textwrap.dedent( """\ { - "hello": "world" + "hello": "world", + "date": "1970-01-01 00:00:00" } """ ), @@ -36,7 +38,7 @@ def test_write(capsys: CaptureFixture[str]): False, textwrap.dedent( """\ - {"hello": "world"} + {"hello": "world", "date": "1970-01-01 00:00:00"} """ ), ), @@ -49,8 +51,8 @@ def test_write_json( console = Console(enable=True) mocker.patch.object(console, "isatty", return_value=isatty) - message = {"hello": "world"} - console.write_json(message) + message = {"hello": "world", "date": datetime.datetime(1970, 1, 1)} + console.write_json(message, default=str) captured = capsys.readouterr() assert captured.out == expected_output