From 438216ce5e27f21908970248593dfc46fe545c80 Mon Sep 17 00:00:00 2001 From: MinRK Date: Sat, 11 May 2013 10:45:18 -0700 Subject: [PATCH] replace unused websocket_host with websocket_url Rather than specifying only the hostname, it makes much more sense to specify the whole protocol,host,port in a single go. --- IPython/frontend/html/notebook/notebookapp.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/IPython/frontend/html/notebook/notebookapp.py b/IPython/frontend/html/notebook/notebookapp.py index 9a0cbfe98..f69e05231 100644 --- a/IPython/frontend/html/notebook/notebookapp.py +++ b/IPython/frontend/html/notebook/notebookapp.py @@ -426,8 +426,12 @@ class NotebookApp(BaseIPythonApplication): elif not new.endswith('/'): self.base_kernel_url = new+'/' - websocket_host = Unicode("", config=True, - help="""The hostname for the websocket server.""" + websocket_url = Unicode("", config=True, + help="""The base URL for the websocket server, + if it differs from the HTTP server (hint: it almost certainly doesn't). + + Should be in the form of an HTTP origin: ws[s]://hostname[:port] + """ ) extra_static_paths = List(Unicode, config=True,