Skip to content
This repository has been archived by the owner on Sep 16, 2024. It is now read-only.

Allow to import from either jupyter_server or notebook packages #25

Merged
merged 1 commit into from
May 16, 2023
Merged

Allow to import from either jupyter_server or notebook packages #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion hybridcontents/hybridmanager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,17 @@
from six import iteritems
from tornado.web import HTTPError

from notebook.services.contents.manager import ContentsManager
# Ref. https://github.com/jupyter/nbdime/blob/c82362344e596efdc4f54c927d90338940e0fa41/nbdime/webapp/nb_server_extension.py#L16-L33
# This allows solving conflicts between the class import from either notebook or jupyter_server
try:
from notebook.services.contents.manager import ContentsManager
except ModuleNotFoundError:
pass

try:
from jupyter_server.services.contents.manager import ContentsManager
except ModuleNotFoundError:
pass

from traitlets import Dict

Expand Down