Merge pull request #831 from c2zwdjnlcg/fix-tests

Fix for notebook version 7+

sparkmagic/requirements.txt

@@ -9,4 +9,4 @@ ipywidgets>5.0.0
 notebook>=4.2
 tornado>=4
 requests_kerberos>=0.8.0
-nest_asyncio==1.5.5
+nest_asyncio>1.5.5

sparkmagic/sparkmagic/serverextension/handlers.py

@@ -1,6 +1,12 @@
 import json
-from notebook.utils import url_path_join
-from notebook.base.handlers import IPythonHandler
+
+try:
+    from jupyter_server.utils import url_path_join
+    from jupyter_server.base.handlers import JupyterHandler as BaseHandler
+except ImportError:
+    from notebook.utils import url_path_join
+    from notebook.base.handlers import IPythonHandler as BaseHandler
+
 from tornado import web
 from tornado import gen
 from tornado.web import MissingArgumentError
@@ -13,7 +19,7 @@
 from sparkmagic.utils.sparklogger import SparkLog
 
 
-class ReconnectHandler(IPythonHandler):
+class ReconnectHandler(BaseHandler):
     logger = None
 
     @web.authenticated