From 9373325f1b06dc14b6c4fe2f5f16a2de8547d62d Mon Sep 17 00:00:00 2001 From: Christian Barra Date: Fri, 27 Jan 2017 14:19:43 +0100 Subject: [PATCH] fix options error and base_url --- jupyterhub/user.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jupyterhub/user.py b/jupyterhub/user.py index 174f60c3..f1885423 100644 --- a/jupyterhub/user.py +++ b/jupyterhub/user.py @@ -210,14 +210,15 @@ class User(HasTraits): where name is the server uuid urlsafed """ db = self.db - if 'server_name' in options: + + if options is not None and 'server_name' in options: server_name = options['server_name'] else: server_name = default_server_name(self) server = orm.Server( name = server_name, cookie_name=self.cookie_name, - base_url=url_path_join(self.base_url, 'server', server_name), + base_url=url_path_join(self.base_url, server_name), ) self.servers.append(server) db.add(self)