##// END OF EJS Templates
Possible fix for GH-169
Possible fix for GH-169

File last commit:

r3144:cd371626
r3144:cd371626
Show More
ipythonqt.py
182 lines | 7.7 KiB | text/x-python | PythonLexer
epatters
Created a proper IPython script from the console frontend demo.
r2801 """ A minimal application using the Qt console-style IPython frontend.
epatters
* The SVG payload matplotlib backend now works....
r2758 """
epatters
* Moved shutdown_kernel method from FrontendWidget to KernelManager....
r2961 #-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
epatters
* The SVG payload matplotlib backend now works....
r2758 # Systemm library imports
Brian Granger
Merge branch 'newkernel' into upstream-newkernel...
r2873 from PyQt4 import QtGui
epatters
* The SVG payload matplotlib backend now works....
r2758
# Local imports
from IPython.external.argparse import ArgumentParser
epatters
Created a proper IPython script from the console frontend demo.
r2801 from IPython.frontend.qt.console.frontend_widget import FrontendWidget
from IPython.frontend.qt.console.ipython_widget import IPythonWidget
from IPython.frontend.qt.console.rich_ipython_widget import RichIPythonWidget
epatters
* The SVG payload matplotlib backend now works....
r2758 from IPython.frontend.qt.kernelmanager import QtKernelManager
epatters
* Moved shutdown_kernel method from FrontendWidget to KernelManager....
r2961 #-----------------------------------------------------------------------------
MinRK
Possible fix for GH-169
r3144 # Network Constants
epatters
* Moved shutdown_kernel method from FrontendWidget to KernelManager....
r2961 #-----------------------------------------------------------------------------
MinRK
Possible fix for GH-169
r3144 from IPython.utils.localinterfaces import LOCALHOST, LOCAL_IPS
epatters
Added arguments to the Qt console frontend script for connecting to an existing kernel and for specifying an IP and specific ports.
r2823
epatters
* Moved shutdown_kernel method from FrontendWidget to KernelManager....
r2961 #-----------------------------------------------------------------------------
# Classes
#-----------------------------------------------------------------------------
class MainWindow(QtGui.QMainWindow):
#---------------------------------------------------------------------------
# 'object' interface
#---------------------------------------------------------------------------
MinRK
prevent remote frontends from closing the kernel
r3142 def __init__(self, app, frontend, existing=False, may_close=True):
epatters
* Moved shutdown_kernel method from FrontendWidget to KernelManager....
r2961 """ Create a MainWindow for the specified FrontendWidget.
MinRK
review fixes
r3100
MinRK
comment/doc logic cleanup
r3105 The app is passed as an argument to allow for different
closing behavior depending on whether we are the Kernel's parent.
MinRK
prevent remote frontends from closing the kernel
r3142 If existing is True, then this Console does not own the Kernel.
If may_close is True, then this Console is permitted to close the kernel
epatters
* Moved shutdown_kernel method from FrontendWidget to KernelManager....
r2961 """
super(MainWindow, self).__init__()
MinRK
changed close Console behavior to leave Kernel alive
r3104 self._app = app
epatters
* Moved shutdown_kernel method from FrontendWidget to KernelManager....
r2961 self._frontend = frontend
MinRK
added shutdown notification handling to ipythonqt
r3090 self._existing = existing
MinRK
Possible fix for GH-169
r3144 if existing:
MinRK
prevent remote frontends from closing the kernel
r3142 self._may_close = may_close
else:
self._may_close = True
epatters
* Moved shutdown_kernel method from FrontendWidget to KernelManager....
r2961 self._frontend.exit_requested.connect(self.close)
self.setCentralWidget(frontend)
#---------------------------------------------------------------------------
# QWidget interface
#---------------------------------------------------------------------------
def closeEvent(self, event):
""" Reimplemented to prompt the user and close the kernel cleanly.
"""
epatters
Fixed the segfaults on application exit. The BracketMatcher, CallTipWidget, and CompletionWidget were using the text control as their parents. This should not be a problem, but for some reason it resulted in problems during shutdown. I suspect that PyQt is bugged and was deleting the C++ objects a second time in the garbage collection phase after they had already been deleted automatically by the C++ layer of Qt.
r2982 kernel_manager = self._frontend.kernel_manager
if kernel_manager and kernel_manager.channels_running:
title = self.window().windowTitle()
MinRK
prevent remote frontends from closing the kernel
r3142 if self._may_close:
reply = QtGui.QMessageBox.question(self, title,
"You are closing this Console window."+
"\nWould you like to quit the Kernel and all attached Consoles as well?",
'Cancel', 'No, just this Console', 'Yes, quit everything')
if reply == 2: # close All
kernel_manager.shutdown_kernel()
#kernel_manager.stop_channels()
event.accept()
elif reply == 1: # close Console
if not self._existing:
# I have the kernel: don't quit, just close the window
self._app.setQuitOnLastWindowClosed(False)
self.deleteLater()
event.accept()
else:
event.ignore()
epatters
Fixed the segfaults on application exit. The BracketMatcher, CallTipWidget, and CompletionWidget were using the text control as their parents. This should not be a problem, but for some reason it resulted in problems during shutdown. I suspect that PyQt is bugged and was deleting the C++ objects a second time in the garbage collection phase after they had already been deleted automatically by the C++ layer of Qt.
r2982 else:
MinRK
prevent remote frontends from closing the kernel
r3142 reply = QtGui.QMessageBox.question(self, title,
"Are you sure you want to close this Console?\n"+
"The Kernel and other Consoles will remain active.",
QtGui.QMessageBox.Yes, QtGui.QMessageBox.No
)
if reply == QtGui.QMessageBox.Yes:
event.accept()
else:
event.ignore()
epatters
* Moved shutdown_kernel method from FrontendWidget to KernelManager....
r2961
#-----------------------------------------------------------------------------
# Main entry point
#-----------------------------------------------------------------------------
epatters
* The SVG payload matplotlib backend now works....
r2758
def main():
epatters
Created a proper IPython script from the console frontend demo.
r2801 """ Entry point for application.
epatters
* The SVG payload matplotlib backend now works....
r2758 """
# Parse command line arguments.
parser = ArgumentParser()
epatters
Added option to ipythonqt.py for setting the paging style and grouped the options into kernel settings/widget settings.
r2871 kgroup = parser.add_argument_group('kernel options')
kgroup.add_argument('-e', '--existing', action='store_true',
epatters
Added arguments to the Qt console frontend script for connecting to an existing kernel and for specifying an IP and specific ports.
r2823 help='connect to an existing kernel')
epatters
Added option to ipythonqt.py for setting the paging style and grouped the options into kernel settings/widget settings.
r2871 kgroup.add_argument('--ip', type=str, default=LOCALHOST,
epatters
Added arguments to the Qt console frontend script for connecting to an existing kernel and for specifying an IP and specific ports.
r2823 help='set the kernel\'s IP address [default localhost]')
epatters
Added option to ipythonqt.py for setting the paging style and grouped the options into kernel settings/widget settings.
r2871 kgroup.add_argument('--xreq', type=int, metavar='PORT', default=0,
epatters
Added arguments to the Qt console frontend script for connecting to an existing kernel and for specifying an IP and specific ports.
r2823 help='set the XREQ channel port [default random]')
epatters
Added option to ipythonqt.py for setting the paging style and grouped the options into kernel settings/widget settings.
r2871 kgroup.add_argument('--sub', type=int, metavar='PORT', default=0,
epatters
Added arguments to the Qt console frontend script for connecting to an existing kernel and for specifying an IP and specific ports.
r2823 help='set the SUB channel port [default random]')
epatters
Added option to ipythonqt.py for setting the paging style and grouped the options into kernel settings/widget settings.
r2871 kgroup.add_argument('--rep', type=int, metavar='PORT', default=0,
epatters
Added arguments to the Qt console frontend script for connecting to an existing kernel and for specifying an IP and specific ports.
r2823 help='set the REP channel port [default random]')
Brian Granger
Added heartbeat support.
r2910 kgroup.add_argument('--hb', type=int, metavar='PORT', default=0,
help='set the heartbeat port [default: random]')
epatters
* Fixed regression from last commit: syntax highlighting works robustly again....
r2866
epatters
Added option to ipythonqt.py for setting the paging style and grouped the options into kernel settings/widget settings.
r2871 egroup = kgroup.add_mutually_exclusive_group()
egroup.add_argument('--pure', action='store_true', help = \
'use a pure Python kernel instead of an IPython kernel')
Brian Granger
Merge branch 'newkernel' into upstream-newkernel...
r2873 egroup.add_argument('--pylab', type=str, metavar='GUI', nargs='?',
Brian Granger
GUI support for wx, qt and tk.
r2872 const='auto', help = \
epatters
* Added support for Ctrl-L per Fernando's request....
r2880 "Pre-load matplotlib and numpy for interactive use. If GUI is not \
given, the GUI backend is matplotlib's, otherwise use one of: \
Fernando Perez
Renamed 'payload-svg' matplotlib backend to 'inline'.
r2991 ['tk', 'gtk', 'qt', 'wx', 'inline'].")
epatters
Added option to ipythonqt.py for setting the paging style and grouped the options into kernel settings/widget settings.
r2871
wgroup = parser.add_argument_group('widget options')
wgroup.add_argument('--paging', type=str, default='inside',
choices = ['inside', 'hsplit', 'vsplit', 'none'],
help='set the paging style [default inside]')
wgroup.add_argument('--rich', action='store_true',
help='enable rich text support')
epatters
Changed the default completion style to text. Text completion now uses the pager.
r2917 wgroup.add_argument('--gui-completion', action='store_true',
help='use a GUI widget for tab completion')
Brian Granger
Merge branch 'newkernel' into upstream-newkernel...
r2873
epatters
Added arguments to the Qt console frontend script for connecting to an existing kernel and for specifying an IP and specific ports.
r2823 args = parser.parse_args()
Brian Granger
Merge branch 'newkernel' into upstream-newkernel...
r2873
epatters
* The SVG payload matplotlib backend now works....
r2758 # Don't let Qt or ZMQ swallow KeyboardInterupts.
import signal
signal.signal(signal.SIGINT, signal.SIG_DFL)
# Create a KernelManager and start a kernel.
epatters
Added arguments to the Qt console frontend script for connecting to an existing kernel and for specifying an IP and specific ports.
r2823 kernel_manager = QtKernelManager(xreq_address=(args.ip, args.xreq),
sub_address=(args.ip, args.sub),
Brian Granger
Added heartbeat support.
r2910 rep_address=(args.ip, args.rep),
hb_address=(args.ip, args.hb))
MinRK
prevent remote frontends from closing the kernel
r3142 if not args.existing:
MinRK
Possible fix for GH-169
r3144 # if not args.ip in LOCAL_IPS+ALL_ALIAS:
# raise ValueError("Must bind a local ip, such as: %s"%LOCAL_IPS)
kwargs = dict(ip=args.ip)
epatters
Added arguments to the Qt console frontend script for connecting to an existing kernel and for specifying an IP and specific ports.
r2823 if args.pure:
MinRK
Possible fix for GH-169
r3144 kwargs['ipython']=False
epatters
Added arguments to the Qt console frontend script for connecting to an existing kernel and for specifying an IP and specific ports.
r2823 elif args.pylab:
MinRK
Possible fix for GH-169
r3144 kwargs['pylab']=args.pylab
kernel_manager.start_kernel(**kwargs)
epatters
* The SVG payload matplotlib backend now works....
r2758 kernel_manager.start_channels()
MinRK
prevent remote frontends from closing the kernel
r3142 local_kernel = (not args.existing) or args.ip == LOCALHOST
epatters
* Tab completion now uses the correct cursor position....
r2841 # Create the widget.
epatters
* The SVG payload matplotlib backend now works....
r2758 app = QtGui.QApplication([])
epatters
Added arguments to the Qt console frontend script for connecting to an existing kernel and for specifying an IP and specific ports.
r2823 if args.pure:
kind = 'rich' if args.rich else 'plain'
MinRK
tweaked close dialog and added prompts to prevent silent remote close
r3129 widget = FrontendWidget(kind=kind, paging=args.paging, local_kernel=local_kernel)
Fernando Perez
Add support for simultaneous interactive and inline matplotlib plots....
r2987 elif args.rich or args.pylab:
MinRK
tweaked close dialog and added prompts to prevent silent remote close
r3129 widget = RichIPythonWidget(paging=args.paging, local_kernel=local_kernel)
epatters
* The SVG payload matplotlib backend now works....
r2758 else:
MinRK
tweaked close dialog and added prompts to prevent silent remote close
r3129 widget = IPythonWidget(paging=args.paging, local_kernel=local_kernel)
epatters
Changed the default completion style to text. Text completion now uses the pager.
r2917 widget.gui_completion = args.gui_completion
epatters
* The SVG payload matplotlib backend now works....
r2758 widget.kernel_manager = kernel_manager
epatters
* Moved shutdown_kernel method from FrontendWidget to KernelManager....
r2961
# Create the main window.
MinRK
prevent remote frontends from closing the kernel
r3142 window = MainWindow(app, widget, args.existing, may_close=local_kernel)
epatters
* Moved shutdown_kernel method from FrontendWidget to KernelManager....
r2961 window.setWindowTitle('Python' if args.pure else 'IPython')
window.show()
epatters
* Tab completion now uses the correct cursor position....
r2841
# Start the application main loop.
epatters
* The SVG payload matplotlib backend now works....
r2758 app.exec_()
if __name__ == '__main__':
main()