Merge branch 'master' into update-from-upstream

nbfetch/handlers.py

@@ -306,16 +306,16 @@ def get(self):
 
 class HSHandler(ExtensionHandler):
     def check_auth(self, authfile=None, username=None, password=None):
-        if authfile:
-            with open(authfile, 'rb') as f:
-                    token, cid = pickle.load(f)
-            hs = HydroShare(client_id=cid, token=token)
-        else:
-            hs = HydroShare(username=username, password=password)
-        self.log.info('hs=%s' % str(hs))
-
         try:
-            info = hs.getUserInfo()
+            if authfile:
+                with open(authfile, 'rb') as f:
+                        token, cid = pickle.load(f)
+                hs = HydroShare(client_id=cid, token=token)
+            else:
+                hs = HydroShare(username=username, password=password)
+            self.log.info('hs=%s' % str(hs))
+
+            info = hs.my_user_info()
             self.settings["hydroshare"] = hs
             self.log.info("info=%s" % info)
         except:
@@ -398,7 +398,7 @@ def get(self):
             self.flush()
             return
 
-        path = os.path.join(pathid, id, "data", "contents", start)
+        path = os.path.join(pathid, "data", "contents", start)
         if app.lower() == "lab":
             path = "lab/tree/" + path
         elif path.lower().endswith(".ipynb"):

setup.py

@@ -37,7 +37,7 @@
     packages=find_packages(),
     include_package_data=True,
     platforms="any",
-    install_requires=["notebook>=5.5.0", "tornado", "hsclient", "jupyter_server"],
+    install_requires=["notebook==6.4.6", "tornado", "hsclient", "jupyter_server"],
     extras_require={"develop": ["pytest", "pytest-jupyter"]},
     data_files=[
         ("etc/jupyter/jupyter_server_config.d", ["jupyter-config/jupyter_server_config.d/nbfetch.json"])