From fd6e6f1dedfcb9fc65fe00f0eb3defeee489c871 Mon Sep 17 00:00:00 2001 From: Pietro Battiston Date: Fri, 24 Apr 2015 12:34:33 +0200 Subject: [PATCH] Get url_path_join from jupyter_notebook --- jupyterhub/utils.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jupyterhub/utils.py b/jupyterhub/utils.py index 03c7721d..80a58094 100644 --- a/jupyterhub/utils.py +++ b/jupyterhub/utils.py @@ -14,7 +14,10 @@ from tornado import web, gen, ioloop from tornado.httpclient import AsyncHTTPClient, HTTPError from tornado.log import app_log -from IPython.html.utils import url_path_join +try: + from jupyter_notebook.utils import url_path_join +except: + from IPython.html.utils import url_path_join def random_port():