support regexes as URL paths in django's bokeh_apps. Fixes bokeh#9946.

wearpants · Apr 20, 2020 · e97d839 · e97d839
1 parent 820aa97
commit e97d839
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/bokeh/server/contexts.py b/bokeh/server/contexts.py
@@ -342,6 +342,9 @@ def __getattr__(self, name):
                 return val
         return super.__getattr__(name)
 
+    def __getitem__(self, name):
+        return self._request[name]
+
 #-----------------------------------------------------------------------------
 # Code
 #-----------------------------------------------------------------------------
diff --git a/bokeh/server/django/routing.py b/bokeh/server/django/routing.py
@@ -114,16 +114,15 @@ def get_websocket_urlpatterns(self) -> List[URLPattern]:
     def _add_new_routing(self, routing: Routing) -> None:
         kwargs = dict(app_context=routing.app_context)
 
-        def join(*components):
-            return "/".join([ component.strip("/") for component in components if component ])
-
         def urlpattern(suffix=""):
-            return r"^{}$".format(join(re.escape(routing.url)) + suffix)
+            if routing.url.endswith("/") and suffix.startswith("/"):
+                suffix = suffix[1:]
+            return r"^{}$".format(routing.url + suffix)
 
         if routing.document:
             self._http_urlpatterns.append(url(urlpattern(), DocConsumer, kwargs=kwargs))
         if routing.autoload:
-            self._http_urlpatterns.append(url(urlpattern("/autoload.js"), AutoloadJsConsumer, kwargs=kwargs))
+            self._http_urlpatterns.append(url(urlpattern("/autoload\.js"), AutoloadJsConsumer, kwargs=kwargs))
 
         self._websocket_urlpatterns.append(url(urlpattern("/ws"), WSConsumer, kwargs=kwargs))