Merge branch 'fix/https' of https://github.com/satra/ipython into satra-fix/https

15 years ago · 1021c3dc88
parent c6d030761e 7d0467df1c
commit 1021c3dc88
1 changed files with 4 additions and 1 deletions
--- a/IPython/frontend/html/notebook/notebookapp.py
+++ b/IPython/frontend/html/notebook/notebookapp.py
@ -263,7 +263,10 @@ class IPythonNotebookApp(BaseIPythonApplication):

    def start(self):
        ip = self.ip if self.ip else '[all ip addresses on your system]'
-        self.log.info("The IPython Notebook is running at: http://%s:%i" % (ip, self.port))
+        proto = 'https' if self.certfile else 'http'
+        self.log.info("The IPython Notebook is running at: %s://%s:%i" % (proto,
+                                                                          ip,
+                                                                          self.port))
        ioloop.IOLoop.instance().start()

 #-----------------------------------------------------------------------------