Merge pull request jupyter-server#304 from Zsailer/urljoin

replace urljoin with url_path_join in extensionapp
hMED22 · Sep 8, 2020 · eb5e986 · eb5e986
2 parents c7addf3 + bd53fd4
commit eb5e986
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/jupyter_server/extension/application.py b/jupyter_server/extension/application.py
@@ -1,7 +1,6 @@
 import sys
 import re
 import logging
-from urllib.parse import urljoin
 
 from jinja2 import Environment, FileSystemLoader
 
@@ -197,7 +196,7 @@ def _default_static_url_prefix(self):
         static_url = "static/{name}/".format(
             name=self.name
         )
-        return urljoin(self.serverapp.base_url, static_url)
+        return url_path_join(self.serverapp.base_url, static_url)
 
     static_paths = List(Unicode(),
         help="""paths to search for serving static files.

diff --git a/jupyter_server/extension/handler.py b/jupyter_server/extension/handler.py
@@ -1,4 +1,3 @@
-from urllib.parse import urljoin
 from jupyter_server.base.handlers import FileFindHandler
 from jinja2.exceptions import TemplateNotFound