Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jupyter-server/jupyter_server
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1e5b8119cd6d7703019399cba34dc85a1550f4b2
Choose a base ref
..
head repository: jupyter-server/jupyter_server
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 08bfe34ce3d168aeaad81ce99a78a20c971bc2ca
Choose a head ref
Showing with 8 additions and 3 deletions.
  1. +8 −3 jupyter_server/extension/manager.py
11 changes: 8 additions & 3 deletions jupyter_server/extension/manager.py
View file
Original file line number Diff line number Diff line change
@@ -250,13 +250,13 @@ class ExtensionManager(LoggingConfigurable):
@default("config_manager")
def _load_default_config_manager(self):
config_manager = ExtensionConfigManager()
self.from_config_manager(config_manager)
self._load_config_manager(config_manager)
return config_manager

@observe("config_manager")
def _config_manager_changed(self, change):
if change.new:
self.from_config_manager(config_manager)
self._load_config_manager(change.new)

# The `extensions` attribute provides a dictionary
# with extension (package) names mapped to their ExtensionPackage interface
@@ -292,7 +292,12 @@ def extension_points(self):

def from_config_manager(self, config_manager):
"""Add extensions found by an ExtensionConfigManager"""
jpserver_extensions = self._config_manager.get_jpserver_extensions()
# load triggered via config_manager trait observer
self.config_manager = config_manager

def _load_config_manager(self, config_manager):
"""Actually load our config manager"""
jpserver_extensions = config_manager.get_jpserver_extensions()
self.from_jpserver_extensions(jpserver_extensions)

def from_jpserver_extensions(self, jpserver_extensions):