Merge branch 'main' into update-ruff-config-again

jupyter-server · Dec 11, 2023 · 702c5f5 · 702c5f5
2 parents 5a533f2 + 23b4434
commit 702c5f5
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/jupyter_server_terminals/app.py b/jupyter_server_terminals/app.py
@@ -36,6 +36,8 @@ class TerminalsExtensionApp(ExtensionApp):
 
     def initialize_settings(self) -> None:
         """Initialize settings."""
+        if not self.serverapp.terminals_enabled:
+            return
         self.initialize_configurables()
         self.settings.update(
             {"terminals_available": True, "terminal_manager": self.terminal_manager}
@@ -71,6 +73,9 @@ def initialize_configurables(self) -> None:
 
     def initialize_handlers(self) -> None:
         """Initialize handlers."""
+        if not self.serverapp.terminals_enabled:
+            # Checking self.terminals_available instead breaks enabling terminals
+            return
         self.handlers.append(
             (
                 r"/terminals/websocket/(\w+)",