Skip to content

Update for compatibility with notebook 7 and nbclassic #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update for compatibility with notebook 7 and nbclassic #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7240d4b
update for compatibility with notebook 7 and nbclassic
RRosio Oct 4, 2023
e56d081
remove print statement
RRosio Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/jupyter_contrib_core/notebook_compat/_compat/nbextensions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,15 @@
ENV_CONFIG_PATH, ENV_JUPYTER_PATH, SYSTEM_CONFIG_PATH, SYSTEM_JUPYTER_PATH,
jupyter_config_dir, jupyter_data_dir,
)
from notebook.nbextensions import (
try:
from notebook.nbextensions import (
ArgumentConflict, __version__, _safe_is_tarfile,
)
except ImportError:
from nbclassic.nbextensions import (
ArgumentConflict, __version__, _safe_is_tarfile,
)

from tornado.log import LogFormatter
from traitlets import Bool
from traitlets.config.manager import BaseJSONConfigManager
Expand Down
4 changes: 2 additions & 2 deletions src/jupyter_contrib_core/notebook_compat/_compat/serverextensions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ def toggle_serverextension_python(import_name, enabled=None, parent=None,
cm = BaseJSONConfigManager(parent=parent, config_dir=config_dir)
cfg = cm.get("jupyter_notebook_config")
server_extensions = (
cfg.setdefault("NotebookApp", {})
.setdefault("server_extensions", [])
cfg.setdefault("ServerApp", {})
.setdefault("jpserver_extensions", [])
)

old_enabled = import_name in server_extensions
Expand Down