diff --git a/IPython/frontend/qt/console/frontend_widget.py b/IPython/frontend/qt/console/frontend_widget.py index fdd9f1d..e732d42 100644 --- a/IPython/frontend/qt/console/frontend_widget.py +++ b/IPython/frontend/qt/console/frontend_widget.py @@ -370,7 +370,7 @@ class FrontendWidget(HistoryConsoleWidget, BaseFrontendMixin): sys.exit(0) else: # we just got notified of a restart! - time.sleep(0.25) # wait 1/4 sec to reest + time.sleep(0.25) # wait 1/4 sec to reset # lest the request for a new prompt # goes to the old kernel self.reset() diff --git a/IPython/frontend/qt/console/ipythonqt.py b/IPython/frontend/qt/console/ipythonqt.py index 63e9d38..f690dec 100644 --- a/IPython/frontend/qt/console/ipythonqt.py +++ b/IPython/frontend/qt/console/ipythonqt.py @@ -33,6 +33,8 @@ class MainWindow(QtGui.QMainWindow): def __init__(self, frontend, existing=False): """ Create a MainWindow for the specified FrontendWidget. + + If existing is True, then this Window does not own the Kernel. """ super(MainWindow, self).__init__() self._frontend = frontend diff --git a/docs/source/development/messaging.txt b/docs/source/development/messaging.txt index fdb4ec3..230880c 100644 --- a/docs/source/development/messaging.txt +++ b/docs/source/development/messaging.txt @@ -663,11 +663,13 @@ be sent, so the content dict is empty. Message type: ``shutdown_request``:: content = { + 'restart' : bool # whether the shutdown is final, or precedes a restart } Message type: ``shutdown_reply``:: content = { + 'restart' : bool # whether the shutdown is final, or precedes a restart } .. Note::