rebase+minor touchup

apache · May 25, 2024 · 03419c0 · 03419c0
1 parent 315f6a3
commit 03419c0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/superset/initialization/__init__.py b/superset/initialization/__init__.py
@@ -76,7 +76,7 @@
 from superset.tags.core import (
     register_sqla_event_listeners as register_tag_event_listeners,
 )
-from superset.utils import core as utils
+from superset.utils import core as utils, json as json_utils
 from superset.utils.core import is_test, pessimistic_connection_handling
 from superset.utils.log import DBEventLogger, get_event_logger_from_cfg_value
 from superset.views.utils import get_error_msg, json_errors_response
@@ -589,7 +589,7 @@ def get_common_bootstrap_data() -> dict[str, Any]:
             def serialize_bootstrap_data() -> str:
                 return json.dumps(
                     {"common": common_bootstrap_payload()},
-                    default=utils.pessimistic_json_iso_dttm_ser,
+                    default=json_utils.pessimistic_json_iso_dttm_ser,
                 )
 
             return {"bootstrap_data": serialize_bootstrap_data}

diff --git a/tests/integration_tests/conftest.py b/tests/integration_tests/conftest.py
@@ -29,7 +29,6 @@
 
 from superset import security_manager
 from superset.extensions import db, feature_flag_manager
-from superset.utils.core import json_dumps_w_dates
 from superset.utils.database import get_example_database, remove_database
 from superset.utils.json import json_dumps_w_dates
 from tests.integration_tests.test_app import app, login