##// END OF EJS Templates
Merge branch 'fix-del-method-exit-test' of http://github.com/takowl/ipython into takowl-fix-del-method-exit-test...
Merge branch 'fix-del-method-exit-test' of http://github.com/takowl/ipython into takowl-fix-del-method-exit-test Fix errors with __del__ methods being called on exit. This branch reintroduces a recent fix that got accidentally overwritten, as well as adding a more stringent form of the test so that we don't miss it again in the future (the old test only printed a message but didn't fail, so it was easy to miss). Closes gh-172 (pull request).

File last commit:

r3144:cd371626
r3178:5c6a3477 merge
Show More
pykernel.py
305 lines | 10.9 KiB | text/x-python | PythonLexer
Fernando Perez
Added zmq kernel file which I forgot
r2598 #!/usr/bin/env python
"""A simple interactive kernel that talks to a frontend over 0MQ.
Things to do:
* Implement `set_parent` logic. Right before doing exec, the Kernel should
call set_parent on all the PUB objects with the message about to be executed.
* Implement random port and security key logic.
* Implement control messages.
* Implement event loop and poll version.
"""
epatters
Kernel subprocess parent polling is now implemented for Windows.
r2712 #-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
epatters
* Added a function for spawning a localhost kernel in a new process on random ports....
r2641 # Standard library imports.
Fernando Perez
Added zmq kernel file which I forgot
r2598 import __builtin__
epatters
Fixed bugs with raw_input and finished and implementing InStream.
r2708 from code import CommandCompiler
Fernando Perez
Added zmq kernel file which I forgot
r2598 import sys
import time
import traceback
epatters
* Added a function for spawning a localhost kernel in a new process on random ports....
r2641 # System library imports.
Fernando Perez
Added zmq kernel file which I forgot
r2598 import zmq
epatters
* Added a function for spawning a localhost kernel in a new process on random ports....
r2641 # Local imports.
epatters
* Restored functionality after major merge....
r2778 from IPython.utils.traitlets import HasTraits, Instance
Fernando Perez
Added zmq kernel file which I forgot
r2598 from completer import KernelCompleter
epatters
* Restored functionality after major merge....
r2778 from entry_point import base_launch_kernel, make_default_main
from session import Session, Message
Fernando Perez
Added zmq kernel file which I forgot
r2598
epatters
Kernel subprocess parent polling is now implemented for Windows.
r2712 #-----------------------------------------------------------------------------
Brian Granger
Remaned kernel.py to pykernel.py and create ipkernel.py.
r2755 # Main kernel class
epatters
Kernel subprocess parent polling is now implemented for Windows.
r2712 #-----------------------------------------------------------------------------
epatters
* Added a function for spawning a localhost kernel in a new process on random ports....
r2641
epatters
* Restored functionality after major merge....
r2778 class Kernel(HasTraits):
epatters
Initial checkin of (not yet working) matplotlib payload backend and associated machinery.
r2756
epatters
Minimal updates to pure Python kernel to keep it (somewhat) API compatible with the IPython Kernel....
r3028 # Private interface
# This is a dict of port number that the kernel is listening on. It is set
# by record_ports and used by connect_request.
_recorded_ports = None
epatters
Initial checkin of (not yet working) matplotlib payload backend and associated machinery.
r2756 #---------------------------------------------------------------------------
# Kernel interface
#---------------------------------------------------------------------------
epatters
* Restored functionality after major merge....
r2778 session = Instance(Session)
reply_socket = Instance('zmq.Socket')
pub_socket = Instance('zmq.Socket')
req_socket = Instance('zmq.Socket')
def __init__(self, **kwargs):
super(Kernel, self).__init__(**kwargs)
Fernando Perez
Added zmq kernel file which I forgot
r2598 self.user_ns = {}
self.history = []
self.compiler = CommandCompiler()
self.completer = KernelCompleter(self.user_ns)
epatters
Initial checkin of (not yet working) matplotlib payload backend and associated machinery.
r2756
Fernando Perez
Added zmq kernel file which I forgot
r2598 # Build dict of handlers for message types
epatters
* Adding object_info_request support to prototype kernel....
r2612 msg_types = [ 'execute_request', 'complete_request',
MinRK
pykernel handles shutdown_request
r3088 'object_info_request', 'shutdown_request' ]
Fernando Perez
Added zmq kernel file which I forgot
r2598 self.handlers = {}
epatters
* Adding object_info_request support to prototype kernel....
r2612 for msg_type in msg_types:
Fernando Perez
Added zmq kernel file which I forgot
r2598 self.handlers[msg_type] = getattr(self, msg_type)
epatters
Initial checkin of (not yet working) matplotlib payload backend and associated machinery.
r2756 def start(self):
""" Start the kernel main loop.
"""
Fernando Perez
Added zmq kernel file which I forgot
r2598 while True:
epatters
Initial checkin of (not yet working) matplotlib payload backend and associated machinery.
r2756 ident = self.reply_socket.recv()
assert self.reply_socket.rcvmore(), "Missing message part."
msg = self.reply_socket.recv_json()
omsg = Message(msg)
print>>sys.__stdout__
print>>sys.__stdout__, omsg
handler = self.handlers.get(omsg.msg_type, None)
if handler is None:
print >> sys.__stderr__, "UNKNOWN MESSAGE TYPE:", omsg
Fernando Perez
Added zmq kernel file which I forgot
r2598 else:
epatters
Initial checkin of (not yet working) matplotlib payload backend and associated machinery.
r2756 handler(ident, omsg)
epatters
Minimal updates to pure Python kernel to keep it (somewhat) API compatible with the IPython Kernel....
r3028 def record_ports(self, xrep_port, pub_port, req_port, hb_port):
"""Record the ports that this kernel is using.
The creator of the Kernel instance must call this methods if they
want the :meth:`connect_request` method to return the port numbers.
"""
self._recorded_ports = {
'xrep_port' : xrep_port,
'pub_port' : pub_port,
'req_port' : req_port,
'hb_port' : hb_port
}
epatters
Initial checkin of (not yet working) matplotlib payload backend and associated machinery.
r2756 #---------------------------------------------------------------------------
# Kernel request handlers
#---------------------------------------------------------------------------
Fernando Perez
Added zmq kernel file which I forgot
r2598
def execute_request(self, ident, parent):
try:
code = parent[u'content'][u'code']
except:
print>>sys.__stderr__, "Got bad msg: "
print>>sys.__stderr__, Message(parent)
return
pyin_msg = self.session.msg(u'pyin',{u'code':code}, parent=parent)
self.pub_socket.send_json(pyin_msg)
epatters
Greatly increased frontend performance by improving kernel stdout/stderr buffering.
r2722
Fernando Perez
Added zmq kernel file which I forgot
r2598 try:
comp_code = self.compiler(code, '<zmq-kernel>')
epatters
* Change input mechanism: replace raw_input instead of stdin....
r2730
# Replace raw_input. Note that is not sufficient to replace
# raw_input in the user namespace.
epatters
Initial checkin of (not yet working) matplotlib payload backend and associated machinery.
r2756 raw_input = lambda prompt='': self._raw_input(prompt, ident, parent)
epatters
* Change input mechanism: replace raw_input instead of stdin....
r2730 __builtin__.raw_input = raw_input
epatters
* The Qt console frontend now ignores cross chatter from other frontends....
r2824 # Set the parent message of the display hook and out streams.
Fernando Perez
Added zmq kernel file which I forgot
r2598 sys.displayhook.set_parent(parent)
epatters
* The Qt console frontend now ignores cross chatter from other frontends....
r2824 sys.stdout.set_parent(parent)
sys.stderr.set_parent(parent)
epatters
* Change input mechanism: replace raw_input instead of stdin....
r2730
Fernando Perez
Added zmq kernel file which I forgot
r2598 exec comp_code in self.user_ns, self.user_ns
except:
etype, evalue, tb = sys.exc_info()
tb = traceback.format_exception(etype, evalue, tb)
exc_content = {
u'status' : u'error',
u'traceback' : tb,
epatters
* Moved AnsiCodeProcessor to separate file, refactored its API, and added unit tests....
r2716 u'ename' : unicode(etype.__name__),
Fernando Perez
Added zmq kernel file which I forgot
r2598 u'evalue' : unicode(evalue)
}
exc_msg = self.session.msg(u'pyerr', exc_content, parent)
self.pub_socket.send_json(exc_msg)
reply_content = exc_content
else:
epatters
* Restored functionality after major merge....
r2778 reply_content = { 'status' : 'ok', 'payload' : {} }
epatters
Greatly increased frontend performance by improving kernel stdout/stderr buffering.
r2722
# Flush output before sending the reply.
sys.stderr.flush()
sys.stdout.flush()
# Send the reply.
Fernando Perez
Added zmq kernel file which I forgot
r2598 reply_msg = self.session.msg(u'execute_reply', reply_content, parent)
print>>sys.__stdout__, Message(reply_msg)
self.reply_socket.send(ident, zmq.SNDMORE)
self.reply_socket.send_json(reply_msg)
if reply_msg['content']['status'] == u'error':
epatters
Initial checkin of (not yet working) matplotlib payload backend and associated machinery.
r2756 self._abort_queue()
def complete_request(self, ident, parent):
epatters
Fixed regressions in the pure Python kernel.
r2867 matches = {'matches' : self._complete(parent),
epatters
* Restored functionality after major merge....
r2778 'status' : 'ok'}
epatters
Initial checkin of (not yet working) matplotlib payload backend and associated machinery.
r2756 completion_msg = self.session.send(self.reply_socket, 'complete_reply',
matches, parent, ident)
print >> sys.__stdout__, completion_msg
def object_info_request(self, ident, parent):
context = parent['content']['oname'].split('.')
object_info = self._object_info(context)
msg = self.session.send(self.reply_socket, 'object_info_reply',
object_info, parent, ident)
print >> sys.__stdout__, msg
MinRK
pykernel handles shutdown_request
r3088 def shutdown_request(self, ident, parent):
content = dict(parent['content'])
msg = self.session.send(self.reply_socket, 'shutdown_reply',
content, parent, ident)
MinRK
added reset:<bool> to shutdown_request content; shutdown_message broadcast on PUB for multiclient notification
r3089 msg = self.session.send(self.pub_socket, 'shutdown_reply',
content, parent, ident)
MinRK
pykernel handles shutdown_request
r3088 print >> sys.__stdout__, msg
time.sleep(0.1)
sys.exit(0)
epatters
Initial checkin of (not yet working) matplotlib payload backend and associated machinery.
r2756 #---------------------------------------------------------------------------
# Protected interface
#---------------------------------------------------------------------------
def _abort_queue(self):
while True:
try:
ident = self.reply_socket.recv(zmq.NOBLOCK)
except zmq.ZMQError, e:
if e.errno == zmq.EAGAIN:
break
else:
assert self.reply_socket.rcvmore(), "Missing message part."
msg = self.reply_socket.recv_json()
print>>sys.__stdout__, "Aborting:"
print>>sys.__stdout__, Message(msg)
msg_type = msg['msg_type']
reply_type = msg_type.split('_')[0] + '_reply'
reply_msg = self.session.msg(reply_type, {'status':'aborted'}, msg)
print>>sys.__stdout__, Message(reply_msg)
self.reply_socket.send(ident,zmq.SNDMORE)
self.reply_socket.send_json(reply_msg)
# We need to wait a bit for requests to come in. This can probably
# be set shorter for true asynchronous clients.
time.sleep(0.1)
Fernando Perez
Added zmq kernel file which I forgot
r2598
epatters
Initial checkin of (not yet working) matplotlib payload backend and associated machinery.
r2756 def _raw_input(self, prompt, ident, parent):
epatters
* Change input mechanism: replace raw_input instead of stdin....
r2730 # Flush output before making the request.
sys.stderr.flush()
sys.stdout.flush()
# Send the input request.
content = dict(prompt=prompt)
msg = self.session.msg(u'input_request', content, parent)
self.req_socket.send_json(msg)
# Await a response.
reply = self.req_socket.recv_json()
try:
value = reply['content']['value']
except:
print>>sys.__stderr__, "Got bad raw_input reply: "
print>>sys.__stderr__, Message(parent)
value = ''
return value
epatters
* Restored functionality after major merge....
r2778 def _complete(self, msg):
return self.completer.complete(msg.content.line, msg.content.text)
epatters
Initial checkin of (not yet working) matplotlib payload backend and associated machinery.
r2756 def _object_info(self, context):
symbol, leftover = self._symbol_from_context(context)
epatters
* Adding object_info_request support to prototype kernel....
r2612 if symbol is not None and not leftover:
doc = getattr(symbol, '__doc__', '')
else:
doc = ''
object_info = dict(docstring = doc)
return object_info
epatters
Initial checkin of (not yet working) matplotlib payload backend and associated machinery.
r2756 def _symbol_from_context(self, context):
epatters
* Adding object_info_request support to prototype kernel....
r2612 if not context:
return None, context
base_symbol_string = context[0]
symbol = self.user_ns.get(base_symbol_string, None)
if symbol is None:
symbol = __builtin__.__dict__.get(base_symbol_string, None)
if symbol is None:
return None, context
context = context[1:]
for i, name in enumerate(context):
new_symbol = getattr(symbol, name, None)
if new_symbol is None:
return symbol, context[i:]
else:
symbol = new_symbol
return symbol, []
epatters
Kernel subprocess parent polling is now implemented for Windows.
r2712 #-----------------------------------------------------------------------------
# Kernel main and launch functions
#-----------------------------------------------------------------------------
MinRK
Possible fix for GH-169
r3144 def launch_kernel(ip=None, xrep_port=0, pub_port=0, req_port=0, hb_port=0,
epatters
* Improved frontend-side kernel restart support....
r2913 independent=False):
epatters
* Added 'independent' argument to 'launch_kernel' for setting subprocess persistence goals. The case for 'independent=False' is only partially implemented....
r2700 """ Launches a localhost kernel, binding to the specified ports.
Parameters
----------
MinRK
Possible fix for GH-169
r3144 ip : str, optional
The ip address the kernel will bind to.
epatters
* Added 'independent' argument to 'launch_kernel' for setting subprocess persistence goals. The case for 'independent=False' is only partially implemented....
r2700 xrep_port : int, optional
The port to use for XREP channel.
pub_port : int, optional
epatters
* Added 'req_port' option to 'launch_kernel' and the kernel entry point....
r2702 The port to use for the SUB channel.
req_port : int, optional
The port to use for the REQ (raw input) channel.
epatters
* Added a function for spawning a localhost kernel in a new process on random ports....
r2641
epatters
* Improved frontend-side kernel restart support....
r2913 hb_port : int, optional
The port to use for the hearbeat REP channel.
epatters
* Added 'independent' argument to 'launch_kernel' for setting subprocess persistence goals. The case for 'independent=False' is only partially implemented....
r2700 independent : bool, optional (default False)
If set, the kernel process is guaranteed to survive if this process
dies. If not set, an effort is made to ensure that the kernel is killed
when this process dies. Note that in this case it is still good practice
epatters
Kernel subprocess parent polling is now implemented for Windows.
r2712 to kill kernels manually before exiting.
epatters
* Added 'independent' argument to 'launch_kernel' for setting subprocess persistence goals. The case for 'independent=False' is only partially implemented....
r2700
Returns
-------
A tuple of form:
epatters
* Added 'req_port' option to 'launch_kernel' and the kernel entry point....
r2702 (kernel_process, xrep_port, pub_port, req_port)
where kernel_process is a Popen object and the ports are integers.
epatters
* Added a function for spawning a localhost kernel in a new process on random ports....
r2641 """
MinRK
Possible fix for GH-169
r3144 extra_arguments = []
if ip is not None:
extra_arguments.append('--ip')
if isinstance(ip, basestring):
extra_arguments.append(ip)
epatters
* Restored functionality after major merge....
r2778 return base_launch_kernel('from IPython.zmq.pykernel import main; main()',
epatters
* Improved frontend-side kernel restart support....
r2913 xrep_port, pub_port, req_port, hb_port,
MinRK
Possible fix for GH-169
r3144 independent, extra_arguments=extra_arguments)
epatters
* Added 'independent' argument to 'launch_kernel' for setting subprocess persistence goals. The case for 'independent=False' is only partially implemented....
r2700
epatters
* Restored functionality after major merge....
r2778 main = make_default_main(Kernel)
Fernando Perez
Added zmq kernel file which I forgot
r2598
if __name__ == '__main__':
epatters
* Implemented a proper main() function for kernel.py that reads command line input....
r2667 main()