hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-18 07:23:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make data a non-optional arg to add_route

Browse Source 
We expect at least an empty dict when we fetch it,
so let's make it non-optional and always pass in something.
This is clearer.
This commit is contained in:
yuvipanda
2017-06-29 11:21:55 -07:00
parent e691231f64
commit ebb7b4b4ae
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jupyterhub/proxy.py
View File

@@ -128,7 +128,7 @@ class Proxy(LoggingConfigurable):
return routespec return routespec
@gen.coroutine @gen.coroutine
def add_route(self, routespec, target, data=None): def add_route(self, routespec, target, data):
"""Add a route to the proxy. """Add a route to the proxy.
**Subclasses must define this method** **Subclasses must define this method**
@@ -331,7 +331,7 @@ class Proxy(LoggingConfigurable):
def add_hub_route(self, hub): def add_hub_route(self, hub):
"""Add the default route for the Hub""" """Add the default route for the Hub"""
self.log.info("Adding default route for Hub: / => %s", hub.host) self.log.info("Adding default route for Hub: / => %s", hub.host)
return self.add_route('/', self.hub.host) return self.add_route('/', self.hub.host, {'hub': True})
@gen.coroutine @gen.coroutine
def restore_routes(self): def restore_routes(self):
@@ -521,7 +521,7 @@ class ConfigurableHTTPProxy(Proxy):
return client.fetch(req) return client.fetch(req)
def add_route(self, routespec, target, data=None): def add_route(self, routespec, target, data):
body = data or {} body = data or {}
body['target'] = target body['target'] = target
body['jupyterhub'] = True body['jupyterhub'] = True

2
jupyterhub/tests/test_proxy.py
View File

@@ -204,7 +204,7 @@ def test_add_get_delete(app, routespec):
proxy = app.proxy proxy = app.proxy
target = 'https://localhost:1234' target = 'https://localhost:1234'
with context(): with context():
yield proxy.add_route(arg, target=target) yield proxy.add_route(arg, target=target, {})
routes = yield proxy.get_all_routes() routes = yield proxy.get_all_routes()
if not expect_value_error: if not expect_value_error:
assert routespec in routes.keys() assert routespec in routes.keys()