Skip to content

Commit 2f4b09a

Browse files
Zsailerkevin-bates
authored andcommitted
don't load extension config if extension are disabled
1 parent 0f015c4 commit 2f4b09a

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

jupyter_server/serverapp.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1542,7 +1542,8 @@ def initialize(self, argv=None, load_extensions=True):
15421542
if self._dispatching:
15431543
return
15441544
self.init_configurables()
1545-
self.init_server_extension_config()
1545+
if load_extensions:
1546+
self.init_server_extension_config()
15461547
self.init_components()
15471548
self.init_webapp()
15481549
self.init_terminals()

jupyter_server/tests/test_extensions.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,8 @@ def test_merge_config(self):
137137
toggle_serverextension_python('mockext_both', enabled=True, user=False)
138138
toggle_serverextension_python('mockext_both', enabled=False, user=True)
139139

140-
<<<<<<< HEAD:jupyter_server/tests/test_extensions.py
141140
app = ServerApp(jpserver_extensions={'mockext_py': True})
142-
=======
143-
app = NotebookApp(nbserver_extensions={'mockext_py': True})
144141
app.init_server_extension_config()
145-
>>>>>>> 134c8b6c0... surface config.d nbserver_extensions to the NotebookApp config object:notebook/tests/test_serverextensions.py
146142
app.init_server_extensions()
147143

148144
assert mock_user.loaded

0 commit comments

Comments
 (0)