##// END OF EJS Templates
Merge branch 'logout_button' of https://github.com/stefanv/ipython into stefanv-logout_button...
Merge branch 'logout_button' of https://github.com/stefanv/ipython into stefanv-logout_button Add a logout button to authenticated notebooks. This has no impact on regular (non-authenticated) notebooks.

File last commit:

r5184:899213ec
r5359:80e7338b merge
Show More
zmqshell.py
581 lines | 22.6 KiB | text/x-python | PythonLexer
Fernando Perez
Ensure that an absolute path is encoded in %edit payload.
r2889 """A ZMQ-based subclass of InteractiveShell.
This code is meant to ease the refactoring of the base InteractiveShell into
something with a cleaner architecture for 2-process use, without actually
breaking InteractiveShell itself. So we're doing something a bit ugly, where
we subclass and override what we want to fix. Once this is working well, we
can go back to the base class and refactor the code for a cleaner inheritance
implementation that doesn't rely on so much monkeypatching.
But this lets us maintain a fully working IPython as we develop the new
machinery. This should thus be thought of as scaffolding.
"""
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
Fernando Perez
Prevent !cmd to try to run backgrounded (cmd &) processes.
r2891 from __future__ import print_function
Fernando Perez
Ensure that an absolute path is encoded in %edit payload.
r2889 # Stdlib
Brian Granger
%edit is now working....
r2827 import inspect
Fernando Perez
Ensure that an absolute path is encoded in %edit payload.
r2889 import os
MinRK
add %qtconsole magic for conveniently launching second console
r4965 import sys
from subprocess import Popen, PIPE
Brian Granger
Initial support in ipkernel for proper displayhook handling.
r2786
Fernando Perez
Ensure that an absolute path is encoded in %edit payload.
r2889 # Our own
Brian Granger
Initial support in ipkernel for proper displayhook handling.
r2786 from IPython.core.interactiveshell import (
InteractiveShell, InteractiveShellABC
)
Fernando Perez
Add init_environment(), %less, %more, %man and %clear/%cls, in zmq shell....
r3005 from IPython.core import page
Thomas Kluyver
Subclass exit autocallable for two process shells, with argument to keep kernel alive.
r3724 from IPython.core.autocall import ZMQExitAutocall
Brian Granger
Mostly final version of display data....
r3277 from IPython.core.displaypub import DisplayPublisher
Brian Granger
%edit is now working....
r2827 from IPython.core.macro import Macro
Thomas Kluyver
Fix up magic_edit functions so they work again.
r3891 from IPython.core.magic import MacroToEdit
Fernando Perez
Add experimental support for cell-based execution....
r2967 from IPython.core.payloadpage import install_payload_page
MinRK
enable %gui/%pylab magics in the Kernel...
r5153 from IPython.lib import pylabtools
MinRK
add IPython.lib.kernel...
r4970 from IPython.lib.kernel import (
get_connection_file, get_connection_info, connect_qtconsole
)
Fernando Perez
Fixed broken coloring on Windows....
r2974 from IPython.utils import io
MinRK
json_clean zmqshell replies...
r4784 from IPython.utils.jsonutil import json_clean
Brian Granger
%edit is now working....
r2827 from IPython.utils.path import get_py_filename
MinRK
add IPython.lib.kernel...
r4970 from IPython.utils.process import arg_split
Thomas Kluyver
Do not load readline when using the ZMQ shell.
r4370 from IPython.utils.traitlets import Instance, Type, Dict, CBool
MinRK
add %connect_info magic for help connecting secondary clients
r4964 from IPython.utils.warn import warn, error
Brian E. Granger
Finishing display system work....
r4528 from IPython.zmq.displayhook import ZMQShellDisplayHook, _encode_binary
Brian Granger
Initial support in ipkernel for proper displayhook handling.
r2786 from IPython.zmq.session import extract_header
Brian Granger
Initial GUI support in kernel.
r2868 from session import Session
Brian Granger
Paging using payloads now works.
r2830
Fernando Perez
Ensure that an absolute path is encoded in %edit payload.
r2889 #-----------------------------------------------------------------------------
# Globals and side-effects
#-----------------------------------------------------------------------------
Brian Granger
Paging using payloads now works.
r2830 # Install the payload version of page.
install_payload_page()
Brian Granger
Initial support in ipkernel for proper displayhook handling.
r2786
Fernando Perez
Ensure that an absolute path is encoded in %edit payload.
r2889 #-----------------------------------------------------------------------------
# Functions and classes
#-----------------------------------------------------------------------------
Brian Granger
Initial support in ipkernel for proper displayhook handling.
r2786
Brian Granger
Mostly final version of display data....
r3277 class ZMQDisplayPublisher(DisplayPublisher):
Brian Granger
Display system is fully working now....
r3278 """A display publisher that publishes data using a ZeroMQ PUB socket."""
Brian Granger
Mostly final version of display data....
r3277
session = Instance(Session)
pub_socket = Instance('zmq.Socket')
parent_header = Dict({})
def set_parent(self, parent):
"""Set the parent for outbound messages."""
self.parent_header = extract_header(parent)
def publish(self, source, data, metadata=None):
if metadata is None:
metadata = {}
self._validate_data(source, data, metadata)
Brian Granger
Using session.send in DisplayPublisher now.
r3287 content = {}
content['source'] = source
Brian E. Granger
Finishing display system work....
r4528 _encode_binary(data)
Brian Granger
Using session.send in DisplayPublisher now.
r3287 content['data'] = data
content['metadata'] = metadata
self.session.send(
MinRK
json_clean zmqshell replies...
r4784 self.pub_socket, u'display_data', json_clean(content),
Brian Granger
Using session.send in DisplayPublisher now.
r3287 parent=self.parent_header
)
Brian Granger
Mostly final version of display data....
r3277
MinRK
add channel-selection to clear_output...
r5085 def clear_output(self, stdout=True, stderr=True, other=True):
content = dict(stdout=stdout, stderr=stderr, other=other)
Brian Granger
Adding clear_output to kernel and HTML notebook.
r5080 self.session.send(
MinRK
add channel-selection to clear_output...
r5085 self.pub_socket, u'clear_output', content,
Brian Granger
Adding clear_output to kernel and HTML notebook.
r5080 parent=self.parent_header
)
Brian Granger
Mostly final version of display data....
r3277
Brian Granger
Initial version of system command out/err forwarding.
r2773 class ZMQInteractiveShell(InteractiveShell):
"""A subclass of InteractiveShell for ZMQ."""
Thomas Kluyver
Move displayhook for ZMQ shell to zmq.displayhook, and rename to make the difference clearer.
r4067 displayhook_class = Type(ZMQShellDisplayHook)
Brian Granger
Mostly final version of display data....
r3277 display_pub_class = Type(ZMQDisplayPublisher)
Bernardo B. Marques
remove all trailling spaces
r4872
Thomas Kluyver
Comment explaining overriding readline_use traitlet.
r4374 # Override the traitlet in the parent class, because there's no point using
# readline for the kernel. Can be removed when the readline code is moved
# to the terminal frontend.
epatters
BUG: Don't use readline in the ZMQShell....
r4816 colors_force = CBool(True)
readline_use = CBool(False)
MinRK
avoid missing readline warning in zmqshell...
r4828 # autoindent has no meaning in a zmqshell, and attempting to enable it
# will print a warning in the absence of readline.
autoindent = CBool(False)
Bernardo B. Marques
remove all trailling spaces
r4872
Thomas Kluyver
Subclass exit autocallable for two process shells, with argument to keep kernel alive.
r3724 exiter = Instance(ZMQExitAutocall)
def _exiter_default(self):
return ZMQExitAutocall(self)
Brian Granger
Mostly final version of display data....
r3277
Erik Tollerud
__builtin__.exit and quit are now hidden - exit magic is now the only exit command
r3185 keepkernel_on_exit = None
Brian Granger
Initial support in ipkernel for proper displayhook handling.
r2786
Fernando Perez
Add init_environment(), %less, %more, %man and %clear/%cls, in zmq shell....
r3005 def init_environment(self):
"""Configure the user's environment.
"""
env = os.environ
# These two ensure 'ls' produces nice coloring on BSD-derived systems
env['TERM'] = 'xterm-color'
env['CLICOLOR'] = '1'
# Since normal pagers don't work at all (over pexpect we don't have
# single-key control of the subprocess), try to disable paging in
# subprocesses as much as possible.
env['PAGER'] = 'cat'
env['GIT_PAGER'] = 'cat'
Fernando Perez
Move terminal-only magics to the terminal class....
r2975
def auto_rewrite_input(self, cmd):
"""Called to show the auto-rewritten input for autocall and friends.
FIXME: this payload is currently not correctly processed by the
frontend.
"""
new = self.displayhook.prompt1.auto_rewrite() + cmd
payload = dict(
source='IPython.zmq.zmqshell.ZMQInteractiveShell.auto_rewrite_input',
transformed_input=new,
)
self.payload_manager.write_payload(payload)
Bernardo B. Marques
remove all trailling spaces
r4872
Fernando Perez
Move terminal-only magics to the terminal class....
r2975 def ask_exit(self):
"""Engage the exit actions."""
payload = dict(
source='IPython.zmq.zmqshell.ZMQInteractiveShell.ask_exit',
exit=True,
Erik Tollerud
__builtin__.exit and quit are now hidden - exit magic is now the only exit command
r3185 keepkernel=self.keepkernel_on_exit,
Fernando Perez
Move terminal-only magics to the terminal class....
r2975 )
self.payload_manager.write_payload(payload)
def _showtraceback(self, etype, evalue, stb):
exc_content = {
u'traceback' : stb,
u'ename' : unicode(etype.__name__),
u'evalue' : unicode(evalue)
}
dh = self.displayhook
# Send exception info over pub socket for other clients than the caller
# to pick up
MinRK
json_clean zmqshell replies...
r4784 exc_msg = dh.session.send(dh.pub_socket, u'pyerr', json_clean(exc_content), dh.parent_header)
Fernando Perez
Move terminal-only magics to the terminal class....
r2975
# FIXME - Hack: store exception info in shell object. Right now, the
# caller is reading this info after the fact, we need to fix this logic
# to remove this hack. Even uglier, we need to store the error status
# here, because in the main loop, the logic that sets it is being
# skipped because runlines swallows the exceptions.
exc_content[u'status'] = u'error'
self._reply_content = exc_content
# /FIXME
Bernardo B. Marques
remove all trailling spaces
r4872
Fernando Perez
Move terminal-only magics to the terminal class....
r2975 return exc_content
#------------------------------------------------------------------------
# Magic overrides
#------------------------------------------------------------------------
# Once the base class stops inheriting from magic, this code needs to be
# moved into a separate machinery as well. For now, at least isolate here
# the magics which this class needs to implement differently from the base
# class, or that are unique to it.
Fernando Perez
Implement %doctest_mode magic in zmqshell with payload....
r2960 def magic_doctest_mode(self,parameter_s=''):
"""Toggle doctest mode on and off.
This mode is intended to make IPython behave as much as possible like a
plain Python shell, from the perspective of how its prompts, exceptions
and output look. This makes it easy to copy and paste parts of a
session into doctests. It does so by:
- Changing the prompts to the classic ``>>>`` ones.
- Changing the exception reporting mode to 'Plain'.
- Disabling pretty-printing of output.
Note that IPython also supports the pasting of code snippets that have
leading '>>>' and '...' prompts in them. This means that you can paste
doctests from files or docstrings (even if they have leading
whitespace), and the code will execute correctly. You can then use
'%history -t' to see the translated history; this will give you the
input after removal of all the leading prompts and whitespace, which
can be pasted back into an editor.
With these features, you can switch into this mode easily whenever you
need to do testing and changes to doctests, without having to leave
your existing IPython session.
"""
from IPython.utils.ipstruct import Struct
# Shorthands
shell = self.shell
Brian Granger
Lots of work on the display system, focused on pylab stuff....
r3280 disp_formatter = self.shell.display_formatter
ptformatter = disp_formatter.formatters['text/plain']
Fernando Perez
Implement %doctest_mode magic in zmqshell with payload....
r2960 # dstore is a data store kept in the instance metadata bag to track any
# changes we make, so we can undo them later.
dstore = shell.meta.setdefault('doctest_mode', Struct())
save_dstore = dstore.setdefault
# save a few values we'll need to recover later
mode = save_dstore('mode', False)
Brian Granger
Lots of work on the display system, focused on pylab stuff....
r3280 save_dstore('rc_pprint', ptformatter.pprint)
save_dstore('rc_plain_text_only',disp_formatter.plain_text_only)
Fernando Perez
Implement %doctest_mode magic in zmqshell with payload....
r2960 save_dstore('xmode', shell.InteractiveTB.mode)
Bernardo B. Marques
remove all trailling spaces
r4872
Fernando Perez
Implement %doctest_mode magic in zmqshell with payload....
r2960 if mode == False:
# turn on
Brian Granger
Lots of work on the display system, focused on pylab stuff....
r3280 ptformatter.pprint = False
disp_formatter.plain_text_only = True
Fernando Perez
Implement %doctest_mode magic in zmqshell with payload....
r2960 shell.magic_xmode('Plain')
else:
# turn off
Brian Granger
Lots of work on the display system, focused on pylab stuff....
r3280 ptformatter.pprint = dstore.rc_pprint
disp_formatter.plain_text_only = dstore.rc_plain_text_only
Fernando Perez
Implement %doctest_mode magic in zmqshell with payload....
r2960 shell.magic_xmode(dstore.xmode)
# Store new mode and inform on console
dstore.mode = bool(1-int(mode))
mode_label = ['OFF','ON'][dstore.mode]
print('Doctest mode is:', mode_label)
Bernardo B. Marques
remove all trailling spaces
r4872
Fernando Perez
Implement %doctest_mode magic in zmqshell with payload....
r2960 # Send the payload back so that clients can modify their prompt display
payload = dict(
source='IPython.zmq.zmqshell.ZMQInteractiveShell.magic_doctest_mode',
mode=dstore.mode)
self.payload_manager.write_payload(payload)
Brian Granger
Started %edit magic.
r2826 def magic_edit(self,parameter_s='',last_call=['','']):
"""Bring up an editor and execute the resulting code.
Usage:
%edit [options] [args]
Thomas Kluyver
Update docstrings for magic_edit (both the terminal version and the GUI version)
r4714 %edit runs an external text editor. You will need to set the command for
this editor via the ``TerminalInteractiveShell.editor`` option in your
configuration file before it will work.
Brian Granger
Started %edit magic.
r2826
This command allows you to conveniently edit multi-line code right in
your IPython session.
Bernardo B. Marques
remove all trailling spaces
r4872
Brian Granger
Started %edit magic.
r2826 If called without arguments, %edit opens up an empty editor with a
temporary file and will execute the contents of this file when you
close it (don't forget to save it!).
Options:
-n <number>: open the editor at a specified line number. By default,
the IPython editor hook uses the unix syntax 'editor +N filename', but
you can configure this by providing your own modified hook if your
favorite editor supports line-number specifications with a different
syntax.
Bernardo B. Marques
remove all trailling spaces
r4872
Brian Granger
Started %edit magic.
r2826 -p: this will call the editor with the same data as the previous time
it was used, regardless of how long ago (in your current session) it
was.
-r: use 'raw' input. This option only applies to input taken from the
user's history. By default, the 'processed' history is used, so that
magics are loaded in their transformed version to valid Python. If
this option is given, the raw input as typed as the command line is
used instead. When you exit the editor, it will be executed by
IPython's own processor.
Bernardo B. Marques
remove all trailling spaces
r4872
Brian Granger
Started %edit magic.
r2826 -x: do not execute the edited code immediately upon exit. This is
mainly useful if you are editing programs which need to be called with
command line arguments, which you can then do using %run.
Arguments:
If arguments are given, the following possibilites exist:
- The arguments are numbers or pairs of colon-separated numbers (like
1 4:8 9). These are interpreted as lines of previous input to be
loaded into the editor. The syntax is the same of the %macro command.
- If the argument doesn't start with a number, it is evaluated as a
variable and its contents loaded into the editor. You can thus edit
any string which contains python code (including the result of
previous edits).
- If the argument is the name of an object (other than a string),
IPython will try to locate the file where it was defined and open the
editor at the point where it is defined. You can use `%edit function`
to load an editor exactly at the point where 'function' is defined,
edit it and have the file be executed automatically.
If the object is a macro (see %macro for details), this opens up your
specified editor with a temporary file containing the macro's data.
Upon exit, the macro is reloaded with the contents of the file.
Note: opening at an exact line is only supported under Unix, and some
editors (like kedit and gedit up to Gnome 2.8) do not understand the
'+NUMBER' parameter necessary for this feature. Good editors like
(X)Emacs, vi, jed, pico and joe all do.
- If the argument is not found as a variable, IPython will look for a
file with that name (adding .py if necessary) and load it into the
editor. It will execute its contents with execfile() when you exit,
loading any code in the file into your interactive namespace.
After executing your code, %edit will return as output the code you
typed in the editor (except when it was an existing file). This way
you can reload the code in further invocations of %edit as a variable,
via _<NUMBER> or Out[<NUMBER>], where <NUMBER> is the prompt number of
the output.
Note that %edit is also available through the alias %ed.
This is an example of creating a simple function inside the editor and
then modifying it. First, start up the editor:
In [1]: ed
Editing... done. Executing edited code...
Out[1]: 'def foo():n print "foo() was defined in an editing session"n'
We can then call the function foo():
Bernardo B. Marques
remove all trailling spaces
r4872
Brian Granger
Started %edit magic.
r2826 In [2]: foo()
foo() was defined in an editing session
Now we edit foo. IPython automatically loads the editor with the
(temporary) file where foo() was previously defined:
Bernardo B. Marques
remove all trailling spaces
r4872
Brian Granger
Started %edit magic.
r2826 In [3]: ed foo
Editing... done. Executing edited code...
And if we call foo() again we get the modified version:
Bernardo B. Marques
remove all trailling spaces
r4872
Brian Granger
Started %edit magic.
r2826 In [4]: foo()
foo() has now been changed!
Here is an example of how to edit a code snippet successive
times. First we call the editor:
In [5]: ed
Editing... done. Executing edited code...
hello
Out[5]: "print 'hello'n"
Now we call it again with the previous output (stored in _):
In [6]: ed _
Editing... done. Executing edited code...
hello world
Out[6]: "print 'hello world'n"
Now we call it with the output #8 (stored in _8, also as Out[8]):
In [7]: ed _8
Editing... done. Executing edited code...
hello again
Out[7]: "print 'hello again'n"
Thomas Kluyver
Update docstrings for magic_edit (both the terminal version and the GUI version)
r4714 """
Bernardo B. Marques
remove all trailling spaces
r4872
Thomas Kluyver
Fix up magic_edit functions so they work again.
r3891 opts,args = self.parse_options(parameter_s,'prn:')
Bernardo B. Marques
remove all trailling spaces
r4872
Brian Granger
Started %edit magic.
r2826 try:
Thomas Kluyver
Fix up magic_edit functions so they work again.
r3891 filename, lineno, _ = self._find_edit_target(args, opts, last_call)
Thomas Kluyver
Refactor magic_edit code somewhat.
r3890 except MacroToEdit as e:
# TODO: Implement macro editing over 2 processes.
Thomas Kluyver
Fix up magic_edit functions so they work again.
r3891 print("Macro editing not yet implemented in 2-process model.")
Thomas Kluyver
Refactor magic_edit code somewhat.
r3890 return
Brian Granger
Started %edit magic.
r2826
Fernando Perez
Ensure that an absolute path is encoded in %edit payload.
r2889 # Make sure we send to the client an absolute path, in case the working
# directory of client and kernel don't match
filename = os.path.abspath(filename)
Brian Granger
Started %edit magic.
r2826 payload = {
'source' : 'IPython.zmq.zmqshell.ZMQInteractiveShell.edit_magic',
'filename' : filename,
'line_number' : lineno
}
self.payload_manager.write_payload(payload)
MinRK
enable %gui/%pylab magics in the Kernel...
r5153 def magic_gui(self, parameter_s=''):
"""Enable or disable IPython GUI event loop integration.
%gui [GUINAME]
This magic replaces IPython's threaded shells that were activated
using the (pylab/wthread/etc.) command line flags. GUI toolkits
can now be enabled at runtime and keyboard
interrupts should work without any problems. The following toolkits
are supported: wxPython, PyQt4, PyGTK, Cocoa, and Tk::
%gui wx # enable wxPython event loop integration
%gui qt4|qt # enable PyQt4 event loop integration
%gui gtk # enable PyGTK event loop integration
%gui OSX # enable Cocoa event loop integration (requires matplotlib 1.1)
%gui tk # enable Tk event loop integration
WARNING: after any of these has been called you can simply create
an application object, but DO NOT start the event loop yourself, as
we have already handled that.
"""
from IPython.zmq.ipkernel import enable_gui
opts, arg = self.parse_options(parameter_s, '')
if arg=='': arg = None
MinRK
quiet error messages instead of tracebacks in %pylab/%gui...
r5162 try:
enable_gui(arg)
except Exception as e:
# print simple error message, rather than traceback if we can't
# hook up the GUI
error(str(e))
MinRK
enable %gui/%pylab magics in the Kernel...
r5153
def enable_pylab(self, gui=None, import_all=True):
"""Activate pylab support at runtime.
This turns on support for matplotlib, preloads into the interactive
namespace all of numpy and pylab, and configures IPython to correcdtly
interact with the GUI event loop. The GUI backend to be used can be
optionally selected with the optional :param:`gui` argument.
Parameters
----------
gui : optional, string [default: inline]
If given, dictates the choice of matplotlib GUI backend to use
(should be one of IPython's supported backends, 'inline', 'qt', 'osx',
'tk', or 'gtk'), otherwise we use the default chosen by matplotlib
(as dictated by the matplotlib build-time options plus the user's
matplotlibrc configuration file).
"""
from IPython.zmq.ipkernel import enable_gui
# We want to prevent the loading of pylab to pollute the user's
# namespace as shown by the %who* magics, so we execute the activation
# code in an empty namespace, and we update *both* user_ns and
# user_ns_hidden with this information.
ns = {}
MinRK
quiet error messages instead of tracebacks in %pylab/%gui...
r5162 try:
gui = pylabtools.pylab_activate(ns, gui, import_all, self)
except KeyError:
error("Backend %r not supported" % gui)
return
MinRK
enable %gui/%pylab magics in the Kernel...
r5153 self.user_ns.update(ns)
self.user_ns_hidden.update(ns)
# Now we must activate the gui pylab wants to use, and fix %run to take
# plot updates into account
MinRK
quiet error messages instead of tracebacks in %pylab/%gui...
r5162 try:
enable_gui(gui)
except Exception as e:
# print simple error message, rather than traceback if we can't
# hook up the GUI
error(str(e))
MinRK
enable %gui/%pylab magics in the Kernel...
r5153 self.magic_run = self._pylab_magic_run
Brian Granger
Updating terminal GUI support to use guisupport.py for qt4/wx.
r2918
Brian Granger
Initial support in ipkernel for proper displayhook handling.
r2786
Fernando Perez
Add init_environment(), %less, %more, %man and %clear/%cls, in zmq shell....
r3005 # A few magics that are adapted to the specifics of using pexpect and a
# remote terminal
def magic_clear(self, arg_s):
"""Clear the terminal."""
if os.name == 'posix':
self.shell.system("clear")
else:
self.shell.system("cls")
if os.name == 'nt':
# This is the usual name in windows
magic_cls = magic_clear
# Terminal pagers won't work over pexpect, but we do have our own pager
Bernardo B. Marques
remove all trailling spaces
r4872
Fernando Perez
Add init_environment(), %less, %more, %man and %clear/%cls, in zmq shell....
r3005 def magic_less(self, arg_s):
"""Show a file through the pager.
Files ending in .py are syntax-highlighted."""
cont = open(arg_s).read()
if arg_s.endswith('.py'):
cont = self.shell.pycolorize(cont)
page.page(cont)
magic_more = magic_less
# Man calls a pager, so we also need to redefine it
if os.name == 'posix':
def magic_man(self, arg_s):
"""Find the man page for the given command and display in pager."""
Fernando Perez
Fix for 'man' formatting (mostly on OSX, but the fix is OK on linux)
r3018 page.page(self.shell.getoutput('man %s | col -b' % arg_s,
split=False))
Brian Granger
Initial support in ipkernel for proper displayhook handling.
r2786
Fernando Perez
Add %guiref to give a quick reference to the GUI console.
r3008 # FIXME: this is specific to the GUI, so we should let the gui app load
# magics at startup that are only for the gui. Once the gui app has proper
# profile and configuration management, we can have it initialize a kernel
# with a special config file that provides these.
def magic_guiref(self, arg_s):
"""Show a basic reference about the GUI console."""
from IPython.core.usage import gui_reference
Fernando Perez
Provide html support for page() in the payload version....
r3011 page.page(gui_reference, auto_html=True)
MinRK
add %connect_info magic for help connecting secondary clients
r4964
def magic_connect_info(self, arg_s):
"""Print information for connecting other clients to this kernel
It will print the contents of this session's connection file, as well as
shortcuts for local clients.
In the simplest case, when called from the most recently launched kernel,
secondary clients can be connected, simply with:
$> ipython <app> --existing
"""
MinRK
update %connect_info magic to cover non-default cases...
r5184
from IPython.core.application import BaseIPythonApplication as BaseIPApp
if BaseIPApp.initialized():
app = BaseIPApp.instance()
security_dir = app.profile_dir.security_dir
profile = app.profile
else:
profile = 'default'
security_dir = ''
MinRK
add %connect_info magic for help connecting secondary clients
r4964 try:
MinRK
add IPython.lib.kernel...
r4970 connection_file = get_connection_file()
info = get_connection_info(unpack=False)
MinRK
add %connect_info magic for help connecting secondary clients
r4964 except Exception as e:
MinRK
add IPython.lib.kernel...
r4970 error("Could not get connection info: %r" % e)
MinRK
add %connect_info magic for help connecting secondary clients
r4964 return
MinRK
update %connect_info magic to cover non-default cases...
r5184
# add profile flag for non-default profile
profile_flag = "--profile %s" % profile if profile != 'default' else ""
# if it's in the security dir, truncate to basename
if security_dir == os.path.dirname(connection_file):
connection_file = os.path.basename(connection_file)
MinRK
add IPython.lib.kernel...
r4970 print (info + '\n')
MinRK
add %connect_info magic for help connecting secondary clients
r4964 print ("Paste the above JSON into a file, and connect with:\n"
" $> ipython <app> --existing <file>\n"
"or, if you are local, you can connect with just:\n"
MinRK
update %connect_info magic to cover non-default cases...
r5184 " $> ipython <app> --existing {0} {1}\n"
MinRK
add %connect_info magic for help connecting secondary clients
r4964 "or even just:\n"
MinRK
update %connect_info magic to cover non-default cases...
r5184 " $> ipython <app> --existing {1}\n"
"if this is the most recent IPython session you have started.".format(
connection_file, profile_flag
)
MinRK
add %connect_info magic for help connecting secondary clients
r4964 )
Bernardo B. Marques
remove all trailling spaces
r4872
MinRK
add %qtconsole magic for conveniently launching second console
r4965 def magic_qtconsole(self, arg_s):
"""Open a qtconsole connected to this kernel.
Useful for connecting a qtconsole to running notebooks, for better
debugging.
"""
MinRK
add IPython.lib.kernel...
r4970 try:
MinRK
split qtconsole's connection-file search into lib.kernel...
r4972 p = connect_qtconsole(argv=arg_split(arg_s, os.name=='posix'))
MinRK
add IPython.lib.kernel...
r4970 except Exception as e:
error("Could not start qtconsole: %r" % e)
MinRK
add %qtconsole magic for conveniently launching second console
r4965 return
Thomas Kluyver
Add set_next_input method to ZMQInteractiveShell, so that %recall can put code at the next prompt.
r3864 def set_next_input(self, text):
"""Send the specified text to the frontend to be presented at the next
input cell."""
Brian Granger
Implemented %loadpy magic for loading .py scripts into Qt console.
r3036 payload = dict(
Bernardo B. Marques
remove all trailling spaces
r4872 source='IPython.zmq.zmqshell.ZMQInteractiveShell.set_next_input',
Thomas Kluyver
Add set_next_input method to ZMQInteractiveShell, so that %recall can put code at the next prompt.
r3864 text=text
Brian Granger
Implemented %loadpy magic for loading .py scripts into Qt console.
r3036 )
self.payload_manager.write_payload(payload)
Fernando Perez
Add %guiref to give a quick reference to the GUI console.
r3008
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 InteractiveShellABC.register(ZMQInteractiveShell)