Skip to content

Commit

Permalink
Revert "Re-use ServerApp.config_file_paths for consistency (#715)" (#728
Browse files Browse the repository at this point in the history
)
  • Loading branch information
blink1073 committed Mar 14, 2022
1 parent a2d11ab commit 262cb46
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
5 changes: 0 additions & 5 deletions jupyter_server/extension/application.py
Expand Up @@ -162,11 +162,6 @@ class method. This method can be set as a entry_point in
def _default_open_browser(self):
return self.serverapp.config["ServerApp"].get("open_browser", True)

@property
def config_file_paths(self):
"""Look on the same path as our parent for config files"""
return self.serverapp.config_file_paths

# The extension name used to name the jupyter config
# file, jupyter_{name}_config.
# This should also match the jupyter subcommand used to launch
Expand Down
7 changes: 6 additions & 1 deletion jupyter_server/serverapp.py
Expand Up @@ -104,6 +104,7 @@
base_flags,
base_aliases,
)
from jupyter_core.paths import jupyter_config_path
from jupyter_client import KernelManager
from jupyter_client.kernelspec import KernelSpecManager
from jupyter_client.session import Session
Expand Down Expand Up @@ -2153,7 +2154,11 @@ def find_server_extensions(self):
# This enables merging on keys, which we want for extension enabling.
# Regular config loading only merges at the class level,
# so each level clobbers the previous.
manager = ExtensionConfigManager(read_config_path=self.config_file_paths)
config_paths = jupyter_config_path()
if self.config_dir not in config_paths:
# add self.config_dir to the front, if set manually
config_paths.insert(0, self.config_dir)
manager = ExtensionConfigManager(read_config_path=config_paths)
extensions = manager.get_jpserver_extensions()

for modulename, enabled in sorted(extensions.items()):
Expand Down

0 comments on commit 262cb46

Please sign in to comment.