|
17 | 17 | )
|
18 | 18 | from jupyter_server._version import __version__
|
19 | 19 | from jupyter_server.extension.config import ExtensionConfigManager
|
20 |
| -from jupyter_server.extension.manager import ExtensionManager |
| 20 | +from jupyter_server.extension.manager import ExtensionManager, ExtensionPackage |
21 | 21 |
|
22 | 22 |
|
23 | 23 | def _get_config_dir(user=False, sys_prefix=False):
|
@@ -216,22 +216,23 @@ def toggle_server_extension(self, import_name):
|
216 | 216 | `load_jupyter_server_extension` function
|
217 | 217 | """
|
218 | 218 | # Create an extension manager for this instance.
|
219 |
| - ext_manager, extension_manager = _get_extmanager_for_context( |
| 219 | + config_dir, extension_manager = _get_extmanager_for_context( |
220 | 220 | user=self.user,
|
221 | 221 | sys_prefix=self.sys_prefix
|
222 | 222 | )
|
223 | 223 | try:
|
224 | 224 | self.log.info("{}: {}".format(self._toggle_pre_message.capitalize(), import_name))
|
225 |
| - self.log.info("- Writing config: {}".format(ext_manager)) |
| 225 | + self.log.info("- Writing config: {}".format(config_dir)) |
226 | 226 | # Validate the server extension.
|
227 | 227 | self.log.info(" - Validating {}...".format(import_name))
|
228 |
| - extension = extension_manager.extensions[import_name] |
229 |
| - extension.validate() |
230 |
| - version = extension.version |
| 228 | + # Interface with the Extension Package and validate. |
| 229 | + extpkg = ExtensionPackage(name=import_name) |
| 230 | + extpkg.validate() |
| 231 | + version = extpkg.version |
231 | 232 | self.log.info(" {} {} {}".format(import_name, version, GREEN_OK))
|
232 | 233 |
|
233 | 234 | # Toggle extension config.
|
234 |
| - config = self.config_manager |
| 235 | + config = extension_manager.config_manager |
235 | 236 | if self._toggle_value is True:
|
236 | 237 | config.enable(import_name)
|
237 | 238 | else:
|
|
0 commit comments