hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-12 20:43:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

add RouteSpec namedtuple for route specification

Browse Source 
namedtuple(path, host)

everywhere that accepts a RouteSpec must also accept a string
and treat it as RouteSpec(string).
RouteSpec.as_routespec(spec_or_string) handles this.
This commit is contained in:
Min RK
2017-06-21 13:04:36 +02:00
parent d2e62a90d7
commit 31fc89c944
5 changed files with 132 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jupyterhub/user.py
View File

@@ -15,7 +15,7 @@ from . import orm
from .objects import Server
from traitlets import HasTraits, Any, Dict, observe, default
from .spawner import LocalProcessSpawner
from .proxy import RouteSpec
class UserDict(dict):
"""Like defaultdict, but for users
@@ -169,11 +169,11 @@ class User(HasTraits):
return quote(self.name, safe='@')
@property
def proxy_path(self):
def proxy_spec(self):
if self.settings.get('subdomain_host'):
return url_path_join('/' + self.domain, self.base_url)
return RouteSpec(path=self.base_url, host=self.domain)
else:
return self.base_url
return RouteSpec(path=self.base_url)
@property
def domain(self):