##// END OF EJS Templates
IPython.core.tests.test_run.test_obj_del apparently no longer fails on Windows, so we don't need to skip it....
IPython.core.tests.test_run.test_obj_del apparently no longer fails on Windows, so we don't need to skip it. Closes gh-59

File last commit:

r3901:5cd1ae15
r3915:22a3c9a1
Show More
ipkernel.py
689 lines | 25.8 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
#-----------------------------------------------------------------------------
Fernando Perez
Improve io.rprint* interface, unify usage in ipkernel....
r2856 from __future__ import print_function
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 # Standard library imports.
Fernando Perez
Added zmq kernel file which I forgot
r2598 import __builtin__
Fernando Perez
Added kernel shutdown support: messaging spec, zmq and client code ready....
r2972 import atexit
Fernando Perez
Added zmq kernel file which I forgot
r2598 import sys
import time
import traceback
Omar Andres Zapata Mesa
logging implemented kernel's messages
r3294 import logging
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.
Brian Granger
First semi-working draft of ipython based kernel.
r2759 from IPython.config.configurable import Configurable
Fernando Perez
Improve io.rprint* interface, unify usage in ipkernel....
r2856 from IPython.utils import io
Fernando Perez
Fix bug with info requests that were not json-safe....
r2948 from IPython.utils.jsonutil import json_clean
Brian Granger
Initial GUI support in kernel.
r2868 from IPython.lib import pylabtools
Fernando Perez
Make exec/event loop times configurable. Set exec one to 500 microseconds.
r2940 from IPython.utils.traitlets import Instance, Float
Fernando Perez
Added kernel shutdown support: messaging spec, zmq and client code ready....
r2972 from entry_point import (base_launch_kernel, make_argument_parser, make_kernel,
start_kernel)
epatters
Cleanup and fixes after merge.
r2796 from iostream import OutStream
epatters
* Restored functionality after major merge....
r2778 from session import Session, Message
from zmqshell import ZMQInteractiveShell
Fernando Perez
Added zmq kernel file which I forgot
r2598
epatters
Kernel subprocess parent polling is now implemented for Windows.
r2712 #-----------------------------------------------------------------------------
Fernando Perez
Merge branch 'kernel-logging' of https://github.com/omazapa/ipython into omazapa-kernel-logging...
r3322 # Globals
#-----------------------------------------------------------------------------
Omar Andres Zapata Mesa
added suggest from Fernando and Robert in logger
r3314
Fernando Perez
Merge branch 'kernel-logging' of https://github.com/omazapa/ipython into omazapa-kernel-logging...
r3322 # Module-level logger
Omar Andres Zapata Mesa
added suggest from Fernando and Robert in logger
r3314 logger = logging.getLogger(__name__)
Fernando Perez
Add support for (manually) activating logging, for now....
r3427 # FIXME: this needs to be done more cleanly later, once we have proper
# configuration support. This is a library, so it shouldn't set a stream
# handler, see:
# http://docs.python.org/library/logging.html#configuring-logging-for-a-library
# But this lets us at least do developer debugging for now by manually turning
# it on/off. And once we have full config support, the client entry points
# will select their logging handlers, as well as passing to this library the
# logging level.
if 0: # dbg - set to 1 to actually see the messages.
logger.addHandler(logging.StreamHandler())
logger.setLevel(logging.DEBUG)
# /FIXME
epatters
Kernel subprocess parent polling is now implemented for Windows.
r2712 #-----------------------------------------------------------------------------
Brian Granger
Separating kernel into smaller pieces.
r2754 # 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
Brian Granger
First semi-working draft of ipython based kernel.
r2759 class Kernel(Configurable):
epatters
* Restored functionality after major merge....
r2778 #---------------------------------------------------------------------------
# Kernel interface
#---------------------------------------------------------------------------
Brian Granger
Moving and renaming in preparation of subclassing InteractiveShell....
r2760 shell = Instance('IPython.core.interactiveshell.InteractiveShellABC')
epatters
* Restored functionality after major merge....
r2778 session = Instance(Session)
Brian Granger
First semi-working draft of ipython based kernel.
r2759 reply_socket = Instance('zmq.Socket')
pub_socket = Instance('zmq.Socket')
req_socket = Instance('zmq.Socket')
Fernando Perez
Make exec/event loop times configurable. Set exec one to 500 microseconds.
r2940 # Private interface
# Time to sleep after flushing the stdout/err buffers in each execute
# cycle. While this introduces a hard limit on the minimal latency of the
# execute cycle, it helps prevent output synchronization problems for
# clients.
# Units are in seconds. The minimum zmq latency on local host is probably
# ~150 microseconds, set this to 500us for now. We may need to increase it
# a little if it's not enough after more interactive testing.
_execute_sleep = Float(0.0005, config=True)
# Frequency of the kernel's event loop.
# Units are in seconds, kernel subclasses for GUI toolkits may need to
# adapt to milliseconds.
_poll_interval = Float(0.05, config=True)
Fernando Perez
Added kernel shutdown support: messaging spec, zmq and client code ready....
r2972
# If the shutdown was requested over the network, we leave here the
# necessary reply message so it can be sent by our registered atexit
# handler. This ensures that the reply is only sent to clients truly at
# the end of our shutdown process (which happens after the underlying
# IPython shell's own shutdown).
_shutdown_message = None
Brian Granger
New connect_request message type added.
r3019
# 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
Omar Andres Zapata Mesa
logging implemented kernel's messages
r3294
Brian Granger
First semi-working draft of ipython based kernel.
r2759 def __init__(self, **kwargs):
super(Kernel, self).__init__(**kwargs)
Brian Granger
Initial support in ipkernel for proper displayhook handling.
r2786
Fernando Perez
Added kernel shutdown support: messaging spec, zmq and client code ready....
r2972 # Before we even start up the shell, register *first* our exit handlers
# so they come before the shell's
atexit.register(self._at_shutdown)
Brian Granger
Initial support in ipkernel for proper displayhook handling.
r2786 # Initialize the InteractiveShell subclass
Brian Granger
Initial version of system command out/err forwarding.
r2773 self.shell = ZMQInteractiveShell.instance()
Brian Granger
Initial support in ipkernel for proper displayhook handling.
r2786 self.shell.displayhook.session = self.session
self.shell.displayhook.pub_socket = self.pub_socket
Brian Granger
Mostly final version of display data....
r3277 self.shell.display_pub.session = self.session
self.shell.display_pub.pub_socket = self.pub_socket
epatters
* Restored functionality after major merge....
r2778
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 # TMP - hack while developing
self.shell._reply_content = None
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',
Thomas Kluyver
Implement more general history_request for ZMQ protocol.
r3817 'object_info_request', 'history_request',
Brian Granger
Added a first_reply signal to the heartbeat channel.
r3024 'connect_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)
Brian Granger
Initial GUI support in kernel.
r2868 def do_one_iteration(self):
Fernando Perez
Added GTK support to ZeroMQ kernel....
r2949 """Do one iteration of the kernel's evaluation loop.
"""
MinRK
all sends/recvs now via Session.send/recv....
r3269 ident,msg = self.session.recv(self.reply_socket, zmq.NOBLOCK)
if msg is None:
return
Brian Granger
Uncommenting reply_socket.recvmore that was broken in 2.0.7.
r3127 # This assert will raise in versions of zeromq 2.0.7 and lesser.
# We now require 2.0.8 or above, so we can uncomment for safety.
MinRK
all sends/recvs now via Session.send/recv....
r3269 # print(ident,msg, file=sys.__stdout__)
assert ident is not None, "Missing message part."
Fernando Perez
Rework messaging to better conform to our spec....
r2926
# Print some info about this message and leave a '--->' marker, so it's
# easier to trace visually the message chain when debugging. Each
# handler prints its message at the end.
# Eventually we'll move these from stdout to a logger.
Omar Andres Zapata Mesa
added suggest from Fernando and Robert in logger
r3314 logger.debug('\n*** MESSAGE TYPE:'+str(msg['msg_type'])+'***')
logger.debug(' Content: '+str(msg['content'])+'\n --->\n ')
Fernando Perez
Rework messaging to better conform to our spec....
r2926
# Find and call actual handler for message
handler = self.handlers.get(msg['msg_type'], None)
Brian Granger
Initial GUI support in kernel.
r2868 if handler is None:
Omar Andres Zapata Mesa
added suggest from Fernando and Robert in logger
r3314 logger.error("UNKNOWN MESSAGE TYPE:" +str(msg))
Brian Granger
Initial GUI support in kernel.
r2868 else:
Fernando Perez
Rework messaging to better conform to our spec....
r2926 handler(ident, msg)
Fernando Perez
Implement exit/quit/Exit/Quit recognition....
r2950
# Check whether we should exit, in case the incoming message set the
# exit flag on
if self.shell.exit_now:
Omar Andres Zapata Mesa
added suggest from Fernando and Robert in logger
r3314 logger.debug('\nExiting IPython kernel...')
Fernando Perez
Implement exit/quit/Exit/Quit recognition....
r2950 # We do a normal, clean exit, which allows any actions registered
# via atexit (such as history saving) to take place.
sys.exit(0)
epatters
* Restored functionality after major merge....
r2778
def start(self):
""" Start the kernel main loop.
"""
Fernando Perez
Added zmq kernel file which I forgot
r2598 while True:
Thomas Kluyver
Kernel event loop is robust against random SIGINT.
r3900 try:
time.sleep(self._poll_interval)
self.do_one_iteration()
except KeyboardInterrupt:
# Ctrl-C shouldn't crash the kernel
Thomas Kluyver
Add message when kernel catches KeyboardInterrupt.
r3901 io.raw_print("KeyboardInterrupt caught in kernel")
Brian Granger
New connect_request message type added.
r3019
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 = {
Brian Granger
Fixing typo in ipkernel.py
r3020 'xrep_port' : xrep_port,
Brian Granger
New connect_request message type added.
r3019 'pub_port' : pub_port,
'req_port' : req_port,
'hb_port' : hb_port
}
epatters
* Restored functionality after major merge....
r2778 #---------------------------------------------------------------------------
# Kernel request handlers
#---------------------------------------------------------------------------
Fernando Perez
Added zmq kernel file which I forgot
r2598
Fernando Perez
Rework messaging to better conform to our spec....
r2926 def _publish_pyin(self, code, parent):
"""Publish the code request on the pyin stream."""
MinRK
all sends/recvs now via Session.send/recv....
r3269 pyin_msg = self.session.send(self.pub_socket, u'pyin',{u'code':code}, parent=parent)
Fernando Perez
Rework messaging to better conform to our spec....
r2926
Fernando Perez
Added zmq kernel file which I forgot
r2598 def execute_request(self, ident, parent):
Brian Granger
Implementing kernel status messages.
r3035
MinRK
all sends/recvs now via Session.send/recv....
r3269 status_msg = self.session.send(self.pub_socket,
Brian Granger
Implementing kernel status messages.
r3035 u'status',
{u'execution_state':u'busy'},
parent=parent
)
Fernando Perez
Added zmq kernel file which I forgot
r2598 try:
Fernando Perez
Rework messaging to better conform to our spec....
r2926 content = parent[u'content']
code = content[u'code']
silent = content[u'silent']
Fernando Perez
Added zmq kernel file which I forgot
r2598 except:
Omar Andres Zapata Mesa
added suggest from Fernando and Robert in logger
r3314 logger.error("Got bad msg: ")
logger.error(str(Message(parent)))
Fernando Perez
Added zmq kernel file which I forgot
r2598 return
epatters
Greatly increased frontend performance by improving kernel stdout/stderr buffering.
r2722
Fernando Perez
Rework messaging to better conform to our spec....
r2926 shell = self.shell # we'll need this a lot here
# Replace raw_input. Note that is not sufficient to replace
# raw_input in the user namespace.
raw_input = lambda prompt='': self._raw_input(prompt, ident, parent)
__builtin__.raw_input = raw_input
# Set the parent message of the display hook and out streams.
shell.displayhook.set_parent(parent)
Brian Granger
Mostly final version of display data....
r3277 shell.display_pub.set_parent(parent)
Fernando Perez
Rework messaging to better conform to our spec....
r2926 sys.stdout.set_parent(parent)
sys.stderr.set_parent(parent)
# Re-broadcast our input for the benefit of listening clients, and
# start computing output
if not silent:
self._publish_pyin(code, parent)
reply_content = {}
Fernando Perez
Added zmq kernel file which I forgot
r2598 try:
Fernando Perez
Rework messaging to better conform to our spec....
r2926 if silent:
Fernando Perez
Update many names to pep-8: savehist -> save_hist....
r3096 # run_code uses 'exec' mode, so no displayhook will fire, and it
Fernando Perez
Rework messaging to better conform to our spec....
r2926 # doesn't call logging or history manipulations. Print
# statements in that code will obviously still execute.
Fernando Perez
Update many names to pep-8: savehist -> save_hist....
r3096 shell.run_code(code)
Fernando Perez
Rework messaging to better conform to our spec....
r2926 else:
Fernando Perez
Finish removing spurious calls to logger and runlines....
r3087 # FIXME: the shell calls the exception handler itself.
Fernando Perez
Add experimental support for cell-based execution....
r2967 shell.run_cell(code)
Fernando Perez
Added zmq kernel file which I forgot
r2598 except:
Fernando Perez
Rework messaging to better conform to our spec....
r2926 status = u'error'
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 # FIXME: this code right now isn't being used yet by default,
Thomas Kluyver
Remove runlines method and calls to it.
r3752 # because the run_cell() call above directly fires off exception
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 # reporting. This code, therefore, is only active in the scenario
# where runlines itself has an unhandled exception. We need to
# uniformize this, for all exception construction to come from a
# single location in the codbase.
Fernando Perez
Added zmq kernel file which I forgot
r2598 etype, evalue, tb = sys.exc_info()
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 tb_list = traceback.format_exception(etype, evalue, tb)
Fernando Perez
Rework messaging to better conform to our spec....
r2926 reply_content.update(shell._showtraceback(etype, evalue, tb_list))
Fernando Perez
Added zmq kernel file which I forgot
r2598 else:
Fernando Perez
Rework messaging to better conform to our spec....
r2926 status = u'ok'
reply_content[u'status'] = status
Fernando Perez
Refactor multiline input and prompt management.
r3077
# Return the execution counter so clients can display prompts
Fernando Perez
Continue refactoring input handling across clients....
r3085 reply_content['execution_count'] = shell.execution_count -1
Fernando Perez
Rework messaging to better conform to our spec....
r2926
# FIXME - fish exception info out of shell, possibly left there by
# runlines. We'll need to clean up this logic later.
if shell._reply_content is not None:
reply_content.update(shell._reply_content)
MinRK
cleanup shell._reply_content after use...
r3853 # reset after use
shell._reply_content = None
Fernando Perez
Rework messaging to better conform to our spec....
r2926
# At this point, we can tell whether the main code execution succeeded
# or not. If it did, we proceed to evaluate user_variables/expressions
if reply_content['status'] == 'ok':
reply_content[u'user_variables'] = \
Fernando Perez
Document the code execution semantics much more carefully....
r3050 shell.user_variables(content[u'user_variables'])
Fernando Perez
Rework messaging to better conform to our spec....
r2926 reply_content[u'user_expressions'] = \
Fernando Perez
Document the code execution semantics much more carefully....
r3050 shell.user_expressions(content[u'user_expressions'])
Fernando Perez
Rework messaging to better conform to our spec....
r2926 else:
# If there was an error, don't even try to compute variables or
# expressions
reply_content[u'user_variables'] = {}
reply_content[u'user_expressions'] = {}
Fernando Perez
Add support for simultaneous interactive and inline matplotlib plots....
r2987
# Payloads should be retrieved regardless of outcome, so we can both
# recover partial output (that could have been generated early in a
# block, before an error) and clear the payload system always.
reply_content[u'payload'] = shell.payload_manager.read_payload()
# Be agressive about clearing the payload because we don't want
# it to sit in memory until the next execute_request comes in.
shell.payload_manager.clear_payload()
Fernando Perez
Add missing flush of output streams on execute
r2938 # Flush output before sending the reply.
sys.stdout.flush()
sys.stderr.flush()
# FIXME: on rare occasions, the flush doesn't seem to make it to the
# clients... This seems to mitigate the problem, but we definitely need
# to better understand what's going on.
Fernando Perez
Make exec/event loop times configurable. Set exec one to 500 microseconds.
r2940 if self._execute_sleep:
time.sleep(self._execute_sleep)
Fernando Perez
Add missing flush of output streams on execute
r2938
MinRK
kernel sends reply on the right side of std<x>.flush
r3333 # Send the reply.
reply_msg = self.session.send(self.reply_socket, u'execute_reply',
reply_content, parent, ident=ident)
logger.debug(str(reply_msg))
Fernando Perez
Added zmq kernel file which I forgot
r2598 if reply_msg['content']['status'] == u'error':
epatters
* Restored functionality after major merge....
r2778 self._abort_queue()
MinRK
all sends/recvs now via Session.send/recv....
r3269 status_msg = self.session.send(self.pub_socket,
Brian Granger
Implementing kernel status messages.
r3035 u'status',
{u'execution_state':u'idle'},
parent=parent
)
epatters
* Restored functionality after major merge....
r2778 def complete_request(self, ident, parent):
Fernando Perez
Improve io.rprint* interface, unify usage in ipkernel....
r2856 txt, matches = self._complete(parent)
matches = {'matches' : matches,
'matched_text' : txt,
epatters
* Restored functionality after major merge....
r2778 'status' : 'ok'}
completion_msg = self.session.send(self.reply_socket, 'complete_reply',
matches, parent, ident)
Omar Andres Zapata Mesa
added suggest from Fernando and Robert in logger
r3314 logger.debug(str(completion_msg))
epatters
* Restored functionality after major merge....
r2778
def object_info_request(self, ident, parent):
Fernando Perez
Implement object info protocol....
r2931 object_info = self.shell.object_inspect(parent['content']['oname'])
Fernando Perez
Add function signature info to calltips....
r3051 # Before we send this object over, we scrub it for JSON usage
oinfo = json_clean(object_info)
epatters
* Restored functionality after major merge....
r2778 msg = self.session.send(self.reply_socket, 'object_info_reply',
Fernando Perez
Fix bug with info requests that were not json-safe....
r2948 oinfo, parent, ident)
Omar Andres Zapata Mesa
added suggest from Fernando and Robert in logger
r3314 logger.debug(msg)
epatters
Merge branch 'newkernel' of git://github.com/ellisonbg/ipython into qtfrontend...
r2795
Thomas Kluyver
Implement more general history_request for ZMQ protocol.
r3817 def history_request(self, ident, parent):
Thomas Kluyver
Fix zmq request code for Python < 2.6.5
r3404 # We need to pull these out, as passing **kwargs doesn't work with
# unicode keys before Python 2.6.5.
Thomas Kluyver
Implement more general history_request for ZMQ protocol.
r3817 hist_access_type = parent['content']['hist_access_type']
epatters
* Added support for prompt and history requests to the kernel manager and Qt console frontend....
r2844 raw = parent['content']['raw']
Thomas Kluyver
Fix zmq request code for Python < 2.6.5
r3404 output = parent['content']['output']
Thomas Kluyver
Implement more general history_request for ZMQ protocol.
r3817 if hist_access_type == 'tail':
n = parent['content']['n']
hist = self.shell.history_manager.get_tail(n, raw=raw, output=output,
include_latest=True)
elif hist_access_type == 'range':
session = parent['content']['session']
start = parent['content']['start']
stop = parent['content']['stop']
hist = self.shell.history_manager.get_range(session, start, stop,
raw=raw, output=output)
elif hist_access_type == 'search':
pattern = parent['content']['pattern']
hist = self.shell.history_manager.search(pattern, raw=raw, output=output)
else:
hist = []
Thomas Kluyver
ipython-qtconsole now calls the right function.
r3397 content = {'history' : list(hist)}
Thomas Kluyver
Rename history_tail_reply back to history_reply.
r3820 msg = self.session.send(self.reply_socket, 'history_reply',
epatters
Merge branch 'newkernel' of git://github.com/ellisonbg/ipython into qtfrontend...
r2795 content, parent, ident)
Omar Andres Zapata Mesa
added suggest from Fernando and Robert in logger
r3314 logger.debug(str(msg))
Brian Granger
New connect_request message type added.
r3019
def connect_request(self, ident, parent):
if self._recorded_ports is not None:
content = self._recorded_ports.copy()
else:
content = {}
msg = self.session.send(self.reply_socket, 'connect_reply',
content, parent, ident)
Omar Andres Zapata Mesa
added suggest from Fernando and Robert in logger
r3314 logger.debug(msg)
Brian Granger
New connect_request message type added.
r3019
Fernando Perez
Added kernel shutdown support: messaging spec, zmq and client code ready....
r2972 def shutdown_request(self, ident, parent):
self.shell.exit_now = True
MinRK
added reset:<bool> to shutdown_request content; shutdown_message broadcast on PUB for multiclient notification
r3089 self._shutdown_message = self.session.msg(u'shutdown_reply', parent['content'], parent)
Fernando Perez
Added kernel shutdown support: messaging spec, zmq and client code ready....
r2972 sys.exit(0)
Brian Granger
New connect_request message type added.
r3019
epatters
* Restored functionality after major merge....
r2778 #---------------------------------------------------------------------------
# Protected interface
#---------------------------------------------------------------------------
Fernando Perez
Added zmq kernel file which I forgot
r2598
epatters
* Restored functionality after major merge....
r2778 def _abort_queue(self):
while True:
MinRK
all sends/recvs now via Session.send/recv....
r3269 ident,msg = self.session.recv(self.reply_socket, zmq.NOBLOCK)
if msg is None:
break
epatters
* Restored functionality after major merge....
r2778 else:
MinRK
all sends/recvs now via Session.send/recv....
r3269 assert ident is not None, \
Fernando Perez
Rework messaging to better conform to our spec....
r2926 "Unexpected missing message part."
Fernando Perez
Merge branch 'kernel-logging' of https://github.com/omazapa/ipython into omazapa-kernel-logging...
r3322
Omar Andres Zapata Mesa
added suggest from Fernando and Robert in logger
r3314 logger.debug("Aborting:\n"+str(Message(msg)))
epatters
* Restored functionality after major merge....
r2778 msg_type = msg['msg_type']
reply_type = msg_type.split('_')[0] + '_reply'
MinRK
all sends/recvs now via Session.send/recv....
r3269 reply_msg = self.session.send(self.reply_socket, reply_type,
{'status' : 'aborted'}, msg, ident=ident)
Omar Andres Zapata Mesa
added suggest from Fernando and Robert in logger
r3314 logger.debug(reply_msg)
epatters
* Restored functionality after major merge....
r2778 # 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)
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)
MinRK
all sends/recvs now via Session.send/recv....
r3269 msg = self.session.send(self.req_socket, u'input_request', content, parent)
epatters
* Change input mechanism: replace raw_input instead of stdin....
r2730
# Await a response.
MinRK
all sends/recvs now via Session.send/recv....
r3269 ident, reply = self.session.recv(self.req_socket, 0)
epatters
* Change input mechanism: replace raw_input instead of stdin....
r2730 try:
value = reply['content']['value']
except:
Omar Andres Zapata Mesa
added suggest from Fernando and Robert in logger
r3314 logger.error("Got bad raw_input reply: ")
logger.error(str(Message(parent)))
epatters
* Change input mechanism: replace raw_input instead of stdin....
r2730 value = ''
return value
epatters
* Restored functionality after major merge....
r2778
def _complete(self, msg):
Fernando Perez
Multiple improvements to tab completion....
r2839 c = msg['content']
try:
cpos = int(c['cursor_pos'])
except:
# If we don't get something that we can convert to an integer, at
Fernando Perez
Improve io.rprint* interface, unify usage in ipkernel....
r2856 # least attempt the completion guessing the cursor is at the end of
# the text, if there's any, and otherwise of the line
Fernando Perez
Multiple improvements to tab completion....
r2839 cpos = len(c['text'])
Fernando Perez
Improve io.rprint* interface, unify usage in ipkernel....
r2856 if cpos==0:
cpos = len(c['line'])
Fernando Perez
Multiple improvements to tab completion....
r2839 return self.shell.complete(c['text'], c['line'], cpos)
Fernando Perez
Added zmq kernel file which I forgot
r2598
epatters
* Restored functionality after major merge....
r2778 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
* Restored functionality after major merge....
r2778 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]
Brian Granger
First semi-working draft of ipython based kernel.
r2759 symbol = self.shell.user_ns.get(base_symbol_string, None)
epatters
* Adding object_info_request support to prototype kernel....
r2612 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, []
Fernando Perez
Added kernel shutdown support: messaging spec, zmq and client code ready....
r2972 def _at_shutdown(self):
"""Actions taken at shutdown by the kernel, called by python's atexit.
"""
# io.rprint("Kernel at_shutdown") # dbg
if self._shutdown_message is not None:
MinRK
all sends/recvs now via Session.send/recv....
r3269 self.session.send(self.reply_socket, self._shutdown_message)
self.session.send(self.pub_socket, self._shutdown_message)
Omar Andres Zapata Mesa
added suggest from Fernando and Robert in logger
r3314 logger.debug(str(self._shutdown_message))
Fernando Perez
Added kernel shutdown support: messaging spec, zmq and client code ready....
r2972 # A very short sleep to give zmq time to flush its message buffers
# before Python truly shuts down.
time.sleep(0.01)
Brian Granger
Initial GUI support in kernel.
r2868
class QtKernel(Kernel):
Brian Granger
GUI support for wx, qt and tk.
r2872 """A Kernel subclass with Qt support."""
Brian Granger
Initial GUI support in kernel.
r2868
def start(self):
"""Start a kernel with QtPy4 event loop integration."""
Brian Granger
GUI support for wx, qt and tk.
r2872
Fernando Perez
Added kernel shutdown support: messaging spec, zmq and client code ready....
r2972 from PyQt4 import QtCore
from IPython.lib.guisupport import get_app_qt4, start_event_loop_qt4
Brian Granger
Minor work on the GUI support in the kernel.
r2900 self.app = get_app_qt4([" "])
self.app.setQuitOnLastWindowClosed(False)
Brian Granger
GUI support for wx, qt and tk.
r2872 self.timer = QtCore.QTimer()
self.timer.timeout.connect(self.do_one_iteration)
Fernando Perez
Make exec/event loop times configurable. Set exec one to 500 microseconds.
r2940 # Units for the timer are in milliseconds
self.timer.start(1000*self._poll_interval)
Brian Granger
Minor work on the GUI support in the kernel.
r2900 start_event_loop_qt4(self.app)
Brian Granger
GUI support for wx, qt and tk.
r2872
Fernando Perez
Rework messaging to better conform to our spec....
r2926
Brian Granger
GUI support for wx, qt and tk.
r2872 class WxKernel(Kernel):
"""A Kernel subclass with Wx support."""
Brian Granger
Initial GUI support in kernel.
r2868
Brian Granger
GUI support for wx, qt and tk.
r2872 def start(self):
"""Start a kernel with wx event loop support."""
import wx
Brian Granger
Minor work on the GUI support in the kernel.
r2900 from IPython.lib.guisupport import start_event_loop_wx
Fernando Perez
Added kernel shutdown support: messaging spec, zmq and client code ready....
r2972
Brian Granger
GUI support for wx, qt and tk.
r2872 doi = self.do_one_iteration
Fernando Perez
Added GTK support to ZeroMQ kernel....
r2949 # Wx uses milliseconds
poll_interval = int(1000*self._poll_interval)
Brian Granger
GUI support for wx, qt and tk.
r2872
# We have to put the wx.Timer in a wx.Frame for it to fire properly.
# We make the Frame hidden when we create it in the main app below.
class TimerFrame(wx.Frame):
def __init__(self, func):
wx.Frame.__init__(self, None, -1)
self.timer = wx.Timer(self)
Fernando Perez
Make exec/event loop times configurable. Set exec one to 500 microseconds.
r2940 # Units for the timer are in milliseconds
Fernando Perez
Added GTK support to ZeroMQ kernel....
r2949 self.timer.Start(poll_interval)
Brian Granger
GUI support for wx, qt and tk.
r2872 self.Bind(wx.EVT_TIMER, self.on_timer)
self.func = func
Fernando Perez
Added GTK support to ZeroMQ kernel....
r2949
Brian Granger
GUI support for wx, qt and tk.
r2872 def on_timer(self, event):
self.func()
# We need a custom wx.App to create our Frame subclass that has the
# wx.Timer to drive the ZMQ event loop.
class IPWxApp(wx.App):
def OnInit(self):
self.frame = TimerFrame(doi)
self.frame.Show(False)
return True
# The redirect=False here makes sure that wx doesn't replace
# sys.stdout/stderr with its own classes.
self.app = IPWxApp(redirect=False)
Brian Granger
Minor work on the GUI support in the kernel.
r2900 start_event_loop_wx(self.app)
Brian Granger
GUI support for wx, qt and tk.
r2872
class TkKernel(Kernel):
"""A Kernel subclass with Tk support."""
def start(self):
"""Start a Tk enabled event loop."""
import Tkinter
doi = self.do_one_iteration
Fernando Perez
Added GTK support to ZeroMQ kernel....
r2949 # Tk uses milliseconds
poll_interval = int(1000*self._poll_interval)
Brian Granger
GUI support for wx, qt and tk.
r2872 # For Tkinter, we create a Tk object and call its withdraw method.
class Timer(object):
def __init__(self, func):
self.app = Tkinter.Tk()
self.app.withdraw()
self.func = func
Fernando Perez
Added GTK support to ZeroMQ kernel....
r2949
Brian Granger
GUI support for wx, qt and tk.
r2872 def on_timer(self):
self.func()
Fernando Perez
Added GTK support to ZeroMQ kernel....
r2949 self.app.after(poll_interval, self.on_timer)
Brian Granger
GUI support for wx, qt and tk.
r2872 def start(self):
self.on_timer() # Call it once to get things going.
self.app.mainloop()
self.timer = Timer(doi)
self.timer.start()
Brian Granger
Initial GUI support in kernel.
r2868
Fernando Perez
Added GTK support to ZeroMQ kernel....
r2949
class GTKKernel(Kernel):
"""A Kernel subclass with GTK support."""
def start(self):
"""Start the kernel, coordinating with the GTK event loop"""
from .gui.gtkembed import GTKEmbed
gtk_kernel = GTKEmbed(self)
gtk_kernel.start()
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
Add stdin/stdout/stderr options to kernel launch functions.
r3828 stdin=None, stdout=None, stderr=None,
epatters
Add option for specifying Python executable to 'launch_kernel'.
r3812 executable=None, independent=False, pylab=False, colors=None):
Fernando Perez
Added GTK support to ZeroMQ kernel....
r2949 """Launches a localhost kernel, binding to the specified ports.
epatters
* Added 'independent' argument to 'launch_kernel' for setting subprocess persistence goals. The case for 'independent=False' is only partially implemented....
r2700
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
Brian Granger
Added heartbeat support.
r2910 hb_port : int, optional
The port to use for the hearbeat REP channel.
epatters
Add stdin/stdout/stderr options to kernel launch functions.
r3828 stdin, stdout, stderr : optional (default None)
Standards streams, as defined in subprocess.Popen.
epatters
Add option for specifying Python executable to 'launch_kernel'.
r3812 executable : str, optional (default sys.executable)
The Python executable to use for the kernel process.
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
epatters
* Restored functionality after major merge....
r2778 pylab : bool or string, optional (default False)
If not False, the kernel will be launched with pylab enabled. If a
string is passed, matplotlib will use the specified backend. Otherwise,
matplotlib's default backend will be used.
MinRK
color settings from ipythonqt propagate down to the ZMQInteractiveShell in the Kernel
r3173 colors : None or string, optional (default None)
If not None, specify the color scheme. One of (NoColor, LightBG, Linux)
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 """
epatters
* Restored functionality after major merge....
r2778 extra_arguments = []
if pylab:
extra_arguments.append('--pylab')
if isinstance(pylab, basestring):
extra_arguments.append(pylab)
MinRK
Possible fix for GH-169
r3144 if ip is not None:
extra_arguments.append('--ip')
if isinstance(ip, basestring):
extra_arguments.append(ip)
MinRK
color settings from ipythonqt propagate down to the ZMQInteractiveShell in the Kernel
r3173 if colors is not None:
extra_arguments.append('--colors')
extra_arguments.append(colors)
epatters
* Restored functionality after major merge....
r2778 return base_launch_kernel('from IPython.zmq.ipkernel import main; main()',
Brian Granger
Added heartbeat support.
r2910 xrep_port, pub_port, req_port, hb_port,
epatters
Add stdin/stdout/stderr options to kernel launch functions.
r3828 stdin, stdout, stderr,
epatters
Add option for specifying Python executable to 'launch_kernel'.
r3812 executable, independent, extra_arguments)
epatters
* Added 'independent' argument to 'launch_kernel' for setting subprocess persistence goals. The case for 'independent=False' is only partially implemented....
r2700
Fernando Perez
Rework messaging to better conform to our spec....
r2926
epatters
* Restored functionality after major merge....
r2778 def main():
""" The IPython kernel main entry point.
"""
parser = make_argument_parser()
parser.add_argument('--pylab', type=str, metavar='GUI', nargs='?',
const='auto', help = \
"Pre-load matplotlib and numpy for interactive use. If GUI is not \
given, the GUI backend is matplotlib's, otherwise use one of: \
MinRK
allow '--pylab osx' in qtconsole...
r3805 ['tk', 'gtk', 'qt', 'wx', 'osx', 'inline'].")
MinRK
color settings from ipythonqt propagate down to the ZMQInteractiveShell in the Kernel
r3173 parser.add_argument('--colors',
type=str, dest='colors',
help="Set the color scheme (NoColor, Linux, and LightBG).",
metavar='ZMQInteractiveShell.colors')
epatters
* Restored functionality after major merge....
r2778 namespace = parser.parse_args()
Brian Granger
Initial GUI support in kernel.
r2868 kernel_class = Kernel
Fernando Perez
Added GTK support to ZeroMQ kernel....
r2949 kernel_classes = {
Brian Granger
Initial GUI support in kernel.
r2868 'qt' : QtKernel,
Fernando Perez
Added GTK support to ZeroMQ kernel....
r2949 'qt4': QtKernel,
Fernando Perez
Renamed 'payload-svg' matplotlib backend to 'inline'.
r2991 'inline': Kernel,
MinRK
allow '--pylab osx' in qtconsole...
r3805 'osx': TkKernel,
Brian Granger
GUI support for wx, qt and tk.
r2872 'wx' : WxKernel,
Fernando Perez
Added GTK support to ZeroMQ kernel....
r2949 'tk' : TkKernel,
'gtk': GTKKernel,
Brian Granger
Initial GUI support in kernel.
r2868 }
epatters
* Restored functionality after major merge....
r2778 if namespace.pylab:
if namespace.pylab == 'auto':
Brian Granger
Initial GUI support in kernel.
r2868 gui, backend = pylabtools.find_gui_and_backend()
epatters
* Restored functionality after major merge....
r2778 else:
Brian Granger
Initial GUI support in kernel.
r2868 gui, backend = pylabtools.find_gui_and_backend(namespace.pylab)
Fernando Perez
Added GTK support to ZeroMQ kernel....
r2949 kernel_class = kernel_classes.get(gui)
Brian Granger
Initial GUI support in kernel.
r2868 if kernel_class is None:
raise ValueError('GUI is not supported: %r' % gui)
pylabtools.activate_matplotlib(backend)
MinRK
color settings from ipythonqt propagate down to the ZMQInteractiveShell in the Kernel
r3173 if namespace.colors:
ZMQInteractiveShell.colors=namespace.colors
Brian Granger
Initial GUI support in kernel.
r2868
kernel = make_kernel(namespace, kernel_class, OutStream)
if namespace.pylab:
Fernando Perez
Add support for simultaneous interactive and inline matplotlib plots....
r2987 pylabtools.import_pylab(kernel.shell.user_ns, backend,
shell=kernel.shell)
Brian Granger
Initial GUI support in kernel.
r2868
epatters
* Restored functionality after major merge....
r2778 start_kernel(namespace, kernel)
Fernando Perez
Added zmq kernel file which I forgot
r2598
Fernando Perez
Rework messaging to better conform to our spec....
r2926
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()