From e49fb8bcecf95544dbe6016c3eff8e1364190e85 Mon Sep 17 00:00:00 2001 From: Josh Barnes Date: Fri, 28 Jul 2017 11:51:59 +0100 Subject: [PATCH] Ensure NbserverListApp produces valid json even for multiple/no servers --- notebook/notebookapp.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/notebook/notebookapp.py b/notebook/notebookapp.py index 132aa4ddf..09d48f54f 100755 --- a/notebook/notebookapp.py +++ b/notebook/notebookapp.py @@ -398,12 +398,12 @@ class NbserverListApp(JupyterApp): "details from the server info file.")) def start(self): - if not self.json: - print(_("Currently running servers:")) - for serverinfo in list_running_servers(self.runtime_dir): - if self.json: - print(json.dumps(serverinfo)) - else: + serverinfo_list = list(list_running_servers(self.runtime_dir)) + if self.json: + print(json.dumps(serverinfo_list)) + else: + print("Currently running servers:") + for serverinfo in serverinfo_list: url = serverinfo['url'] if serverinfo.get('token'): url = url + '?token=%s' % serverinfo['token']