Skip to content

Commit 16762f2

Browse files
committed
Add back the overrides loading at handler level as a fallback
To make the change non-breaking in case if other apps used this handler which is a part of the public API
1 parent 1ea2d53 commit 16762f2

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

jupyterlab_server/settings_handler.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def initialize( # type:ignore[override]
2525
schemas_dir: str,
2626
settings_dir: str,
2727
labextensions_path: list[str],
28-
overrides: dict[str, Any],
28+
overrides: dict[str, Any] | None = None,
2929
**kwargs: Any, # noqa: ARG002
3030
) -> None:
3131
"""Initialize the handler."""

jupyterlab_server/settings_utils.py

+8-1
Original file line numberDiff line numberDiff line change
@@ -448,17 +448,24 @@ def initialize(
448448
schemas_dir: str,
449449
settings_dir: str,
450450
labextensions_path: list[str] | None,
451-
overrides: dict[str, Any],
451+
overrides: dict[str, Any] | None = None,
452452
**kwargs: Any,
453453
) -> None:
454454
"""Initialize the handler."""
455455
super().initialize(**kwargs)
456+
error = None
457+
if not overrides:
458+
overrides, error = _get_overrides(app_settings_dir)
456459
self.overrides = overrides
457460
self.app_settings_dir = app_settings_dir
458461
self.schemas_dir = schemas_dir
459462
self.settings_dir = settings_dir
460463
self.labextensions_path = labextensions_path
461464

465+
if error:
466+
overrides_warning = "Failed loading overrides: %s"
467+
self.log.warning(overrides_warning, error)
468+
462469
def get_current_locale(self) -> str:
463470
"""
464471
Get the current locale as specified in the translation-extension settings.

0 commit comments

Comments
 (0)