##// END OF EJS Templates
update payload source...
update payload source should be simple key, not Python (or worse, IPython) specific long key. I could have sworn I did this long ago, but apparently the source key was only updated in display_data, not execute_reply.

File last commit:

r11174:bc17e08c
r11839:8cbae575
Show More
embed.py
301 lines | 11.6 KiB | text/x-python | PythonLexer
Brian Granger
Removed shell.py entirely and made the embedded shell a proper subclass....
r2206 # encoding: utf-8
"""
An embedded IPython shell.
Authors:
* Brian Granger
* Fernando Perez
Notes
-----
"""
#-----------------------------------------------------------------------------
Matthias BUSSONNIER
update copyright to 2011/20xx-2011...
r5390 # Copyright (C) 2008-2011 The IPython Development Team
Brian Granger
Removed shell.py entirely and made the embedded shell a proper subclass....
r2206 #
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
Brian Granger
Created context manager for the things injected into __builtin__.
r2227 from __future__ import with_statement
Brian Granger
Removed shell.py entirely and made the embedded shell a proper subclass....
r2206 import sys
Thomas Kluyver
Add global_ns argument to embedding, for backwards compatibility.
r5675 import warnings
Brian Granger
Removed shell.py entirely and made the embedded shell a proper subclass....
r2206
Fernando Perez
Fix contextlib imports for python3 as per @takluyver's review.
r6987 # We need to use nested to support python 2.6, once we move to >=2.7, we can
# use the with keyword's new builtin support for nested managers
try:
from contextlib import nested
except:
from IPython.utils.nested_context import nested
Bradley M. Froehle
embed(): Default to the future compile flags of the calling frame.
r7894 from IPython.core import ultratb, compilerop
Fernando Perez
Renamed @register_magics to @magics_class to avoid confusion....
r6973 from IPython.core.magic import Magics, magics_class, line_magic
Fernando Perez
Fix imports for plain terminal ipython and use a proper warn() call.
r11020 from IPython.terminal.interactiveshell import TerminalInteractiveShell
from IPython.terminal.ipapp import load_default_config
Brian Granger
Removed shell.py entirely and made the embedded shell a proper subclass....
r2206
Thomas Kluyver
Eliminate Str and CStr trait types except in IPython.parallel
r4046 from IPython.utils.traitlets import Bool, CBool, Unicode
Brian Granger
Work to address the review comments on Fernando's branch....
r2498 from IPython.utils.io import ask_yes_no
Brian Granger
Removed shell.py entirely and made the embedded shell a proper subclass....
r2206
Brian Granger
Massive refactoring of of the core....
r2245
Brian Granger
Removed shell.py entirely and made the embedded shell a proper subclass....
r2206 #-----------------------------------------------------------------------------
# Classes and functions
#-----------------------------------------------------------------------------
# This is an additional magic that is exposed in embedded shells.
Fernando Perez
Renamed @register_magics to @magics_class to avoid confusion....
r6973 @magics_class
Fernando Perez
Update embedded shell to new magics API.
r6941 class EmbeddedMagics(Magics):
Brian Granger
Removed shell.py entirely and made the embedded shell a proper subclass....
r2206
Fernando Perez
Update embedded shell to new magics API.
r6941 @line_magic
def kill_embedded(self, parameter_s=''):
"""%kill_embedded : deactivate for good the current embedded IPython.
Bernardo B. Marques
remove all trailling spaces
r4872
Fernando Perez
Update embedded shell to new magics API.
r6941 This function (after asking for confirmation) sets an internal flag so
that an embedded IPython will never activate again. This is useful to
permanently disable a shell that is being called inside a loop: once
you've figured out what you needed from it, you may then kill it and
the program will then continue to run without the interactive shell
interfering again.
"""
kill = ask_yes_no("Are you sure you want to kill this embedded instance "
"(y/n)? [y/N] ",'n')
if kill:
self.shell.embedded_active = False
print ("This embedded IPython will not reactivate anymore "
"once you exit.")
Brian Granger
Removed shell.py entirely and made the embedded shell a proper subclass....
r2206
Brian Granger
Complete reorganization of InteractiveShell....
r2761 class InteractiveShellEmbed(TerminalInteractiveShell):
Brian Granger
Removed shell.py entirely and made the embedded shell a proper subclass....
r2206
dummy_mode = Bool(False)
MinRK
fix at least some command-line unicode options
r3464 exit_msg = Unicode('')
Brian Granger
Cleaned up embedded shell and added cleanup method to InteractiveShell....
r2226 embedded = CBool(True)
embedded_active = CBool(True)
Brian Granger
Work on startup related things....
r2252 # Like the base class display_banner is not configurable, but here it
# is True by default.
display_banner = CBool(True)
Brian Granger
Removed shell.py entirely and made the embedded shell a proper subclass....
r2206
Brian Granger
Complete reorganization of InteractiveShell....
r2761 def __init__(self, config=None, ipython_dir=None, user_ns=None,
Thomas Kluyver
Fix embedding terminal IPython with new namespace model.
r5459 user_module=None, custom_exceptions=((),None),
Brian Granger
Complete reorganization of InteractiveShell....
r2761 usage=None, banner1=None, banner2=None,
Thomas Kluyver
Restore dummy user_global_ns parameter for embedding (backwards compatibility)
r5676 display_banner=None, exit_msg=u'', user_global_ns=None):
if user_global_ns is not None:
warnings.warn("user_global_ns has been replaced by user_module. The\
parameter will be ignored.", DeprecationWarning)
Brian Granger
Removed shell.py entirely and made the embedded shell a proper subclass....
r2206
super(InteractiveShellEmbed,self).__init__(
Brian Granger
Complete reorganization of InteractiveShell....
r2761 config=config, ipython_dir=ipython_dir, user_ns=user_ns,
Thomas Kluyver
Fix embedding terminal IPython with new namespace model.
r5459 user_module=user_module, custom_exceptions=custom_exceptions,
Brian Granger
Complete reorganization of InteractiveShell....
r2761 usage=usage, banner1=banner1, banner2=banner2,
display_banner=display_banner
)
Brian Granger
Removed shell.py entirely and made the embedded shell a proper subclass....
r2206
self.exit_msg = exit_msg
# don't use the ipython crash handler so that user exceptions aren't
# trapped
Brian Granger
Cleaned up embedded shell and added cleanup method to InteractiveShell....
r2226 sys.excepthook = ultratb.FormattedTB(color_scheme=self.colors,
mode=self.xmode,
call_pdb=self.pdb)
Brian Granger
Removed shell.py entirely and made the embedded shell a proper subclass....
r2206
Brian Granger
Cleaned up embedded shell and added cleanup method to InteractiveShell....
r2226 def init_sys_modules(self):
pass
Fernando Perez
Update embedded shell to new magics API.
r6941 def init_magics(self):
super(InteractiveShellEmbed, self).init_magics()
self.register_magics(EmbeddedMagics)
Thomas Kluyver
Fix embedding terminal IPython with new namespace model.
r5459 def __call__(self, header='', local_ns=None, module=None, dummy=None,
Bradley M. Froehle
Allow embed(..., compile_flags=...)
r7895 stack_depth=1, global_ns=None, compile_flags=None):
Brian Granger
Removed shell.py entirely and made the embedded shell a proper subclass....
r2206 """Activate the interactive interpreter.
Thomas Kluyver
Update docs about embedding.
r5684 __call__(self,header='',local_ns=None,module=None,dummy=None) -> Start
Brian Granger
Removed shell.py entirely and made the embedded shell a proper subclass....
r2206 the interpreter shell with the given local and global namespaces, and
optionally print a header string at startup.
The shell can be globally activated/deactivated using the
Thomas Kluyver
Update docs about embedding.
r5684 dummy_mode attribute. This allows you to turn off a shell used
Brian Granger
Removed shell.py entirely and made the embedded shell a proper subclass....
r2206 for debugging globally.
However, *each* time you call the shell you can override the current
state of dummy_mode with the optional keyword parameter 'dummy'. For
Thomas Kluyver
Update docs about embedding.
r5684 example, if you set dummy mode on with IPShell.dummy_mode = True, you
can still have a specific call work by making it as IPShell(dummy=False).
Brian Granger
Removed shell.py entirely and made the embedded shell a proper subclass....
r2206 """
# If the user has turned it off, go away
if not self.embedded_active:
return
# Normal exits from interactive mode set this flag, so the shell can't
# re-enter (it checks this variable at the start of interactive mode).
self.exit_now = False
# Allow the dummy parameter to override the global __dummy_mode
if dummy or (dummy != 0 and self.dummy_mode):
return
if self.has_readline:
Thomas Kluyver
Fix function call in terminal embed code....
r3483 self.set_readline_completer()
Brian Granger
Removed shell.py entirely and made the embedded shell a proper subclass....
r2206
Brian Granger
Work on startup related things....
r2252 # self.banner is auto computed
if header:
self.old_banner2 = self.banner2
self.banner2 = self.banner2 + '\n' + header + '\n'
Fernando Perez
Fix small error on exit from embedded shells.
r2583 else:
self.old_banner2 = ''
Brian Granger
Removed shell.py entirely and made the embedded shell a proper subclass....
r2206
# Call the embedding code with a stack depth of 1 so it can skip over
# our call and get the original caller's namespaces.
Bradley M. Froehle
Allow embed(..., compile_flags=...)
r7895 self.mainloop(local_ns, module, stack_depth=stack_depth,
global_ns=global_ns, compile_flags=compile_flags)
Brian Granger
Work on startup related things....
r2252
self.banner2 = self.old_banner2
Brian Granger
Removed shell.py entirely and made the embedded shell a proper subclass....
r2206
Brian Granger
Cleaned up embedded shell and added cleanup method to InteractiveShell....
r2226 if self.exit_msg is not None:
Brian Granger
Removed shell.py entirely and made the embedded shell a proper subclass....
r2206 print self.exit_msg
Brian Granger
sys.displayhook is now managed dynamically by display_trap.
r2231
Thomas Kluyver
Fix embedding terminal IPython with new namespace model.
r5459 def mainloop(self, local_ns=None, module=None, stack_depth=0,
Bradley M. Froehle
embed(): Default to the future compile flags of the calling frame.
r7894 display_banner=None, global_ns=None, compile_flags=None):
Brian Granger
Created context manager for the things injected into __builtin__.
r2227 """Embeds IPython into a running python program.
Input:
- header: An optional header message can be specified.
Thomas Kluyver
Update docs about embedding.
r5684 - local_ns, module: working local namespace (a dict) and module (a
module or similar object). If given as None, they are automatically
taken from the scope where the shell was called, so that
program variables become visible.
Brian Granger
Created context manager for the things injected into __builtin__.
r2227
- stack_depth: specifies how many levels in the stack to go to
Thomas Kluyver
Update docs about embedding.
r5684 looking for namespaces (when local_ns or module is None). This
Brian Granger
Created context manager for the things injected into __builtin__.
r2227 allows an intermediate caller to make sure that this function gets
the namespace from the intended level in the stack. By default (0)
it will get its locals and globals from the immediate caller.
Bradley M. Froehle
embed(): Default to the future compile flags of the calling frame.
r7894 - compile_flags: A bit field identifying the __future__ features
that are enabled, as passed to the builtin `compile` function. If
given as None, they are automatically taken from the scope where the
shell was called.
Brian Granger
Created context manager for the things injected into __builtin__.
r2227 Warning: it's possible to use this in a program which is being run by
IPython itself (via %run), but some funny things will happen (a few
globals get overwritten). In the future this will be cleaned up, as
there is no fundamental reason why it can't work perfectly."""
Thomas Kluyver
Add global_ns argument to embedding, for backwards compatibility.
r5675
if (global_ns is not None) and (module is None):
class DummyMod(object):
"""A dummy module object for embedded IPython."""
pass
warnings.warn("global_ns is deprecated, use module instead.", DeprecationWarning)
module = DummyMod()
module.__dict__ = global_ns
Brian Granger
Created context manager for the things injected into __builtin__.
r2227
# Get locals and globals from caller
Bradley M. Froehle
Fix regression in embed() from pull-request #2096....
r8130 if ((local_ns is None or module is None or compile_flags is None)
and self.default_user_namespaces):
Brian Granger
Created context manager for the things injected into __builtin__.
r2227 call_frame = sys._getframe(stack_depth).f_back
Thomas Kluyver
Simplify logic for deciding when to auto-detect local namespace and module.
r5669 if local_ns is None:
Brian Granger
Created context manager for the things injected into __builtin__.
r2227 local_ns = call_frame.f_locals
Thomas Kluyver
Simplify logic for deciding when to auto-detect local namespace and module.
r5669 if module is None:
Brian Granger
Created context manager for the things injected into __builtin__.
r2227 global_ns = call_frame.f_globals
Thomas Kluyver
Fix embedding terminal IPython with new namespace model.
r5459 module = sys.modules[global_ns['__name__']]
Bradley M. Froehle
embed(): Default to the future compile flags of the calling frame.
r7894 if compile_flags is None:
compile_flags = (call_frame.f_code.co_flags &
compilerop.PyCF_MASK)
Thomas Kluyver
Fix embedding terminal IPython with new namespace model.
r5459
# Save original namespace and module so we can restore them after
# embedding; otherwise the shell doesn't shut down correctly.
orig_user_module = self.user_module
orig_user_ns = self.user_ns
Bradley M. Froehle
embed(): Default to the future compile flags of the calling frame.
r7894 orig_compile_flags = self.compile.flags
Thomas Kluyver
Fix embedding terminal IPython with new namespace model.
r5459
Brian Granger
Created context manager for the things injected into __builtin__.
r2227 # Update namespaces and fire up interpreter
Thomas Kluyver
Fix embedding terminal IPython with new namespace model.
r5459
Brian Granger
Created context manager for the things injected into __builtin__.
r2227 # The global one is easy, we can just throw it in
Thomas Kluyver
Don't override passed user_ns in embed()
r5667 if module is not None:
self.user_module = module
Brian Granger
Created context manager for the things injected into __builtin__.
r2227
Thomas Kluyver
Fix embedding terminal IPython with new namespace model.
r5459 # But the user/local one is tricky: ipython needs it to store internal
# data, but we also need the locals. We'll throw our hidden variables
# like _ih and get_ipython() into the local namespace, but delete them
# later.
Thomas Kluyver
Don't override passed user_ns in embed()
r5667 if local_ns is not None:
self.user_ns = local_ns
self.init_user_ns()
Brian Granger
Created context manager for the things injected into __builtin__.
r2227
Bradley M. Froehle
embed(): Default to the future compile flags of the calling frame.
r7894 # Compiler flags
Bradley M. Froehle
Fix regression in embed() from pull-request #2096....
r8130 if compile_flags is not None:
self.compile.flags = compile_flags
Bradley M. Froehle
embed(): Default to the future compile flags of the calling frame.
r7894
Brian Granger
Created context manager for the things injected into __builtin__.
r2227 # Patch for global embedding to make sure that things don't overwrite
# user globals accidentally. Thanks to Richard <rxe@renre-europe.com>
# FIXME. Test this a bit more carefully (the if.. is new)
Thomas Kluyver
Fix embedding terminal IPython with new namespace model.
r5459 # N.B. This can't now ever be called. Not sure what it was for.
Thomas Kluyver
Don't override passed user_ns in embed()
r5667 # And now, since it wasn't called in the previous version, I'm
# commenting out these lines so they can't be called with my new changes
# --TK, 2011-12-10
#if local_ns is None and module is None:
# self.user_global_ns.update(__main__.__dict__)
Brian Granger
Created context manager for the things injected into __builtin__.
r2227
# make sure the tab-completer has the correct frame information, so it
# actually completes using the frame's locals/globals
self.set_completer_frame()
Brian Granger
sys.displayhook is now managed dynamically by display_trap.
r2231 with nested(self.builtin_trap, self.display_trap):
Brian Granger
Work on startup related things....
r2252 self.interact(display_banner=display_banner)
Thomas Kluyver
Fix embedding terminal IPython with new namespace model.
r5459
# now, purge out the local namespace of IPython's hidden variables.
Thomas Kluyver
Don't override passed user_ns in embed()
r5667 if local_ns is not None:
for name in self.user_ns_hidden:
local_ns.pop(name, None)
Thomas Kluyver
Fix embedding terminal IPython with new namespace model.
r5459
# Restore original namespace so shell can shut down when we exit.
self.user_module = orig_user_module
self.user_ns = orig_user_ns
Bradley M. Froehle
embed(): Default to the future compile flags of the calling frame.
r7894 self.compile.flags = orig_compile_flags
Brian Granger
Cleaned up embedded shell and added cleanup method to InteractiveShell....
r2226
Brian Granger
Complete reorganization of InteractiveShell....
r2761 def embed(**kwargs):
Brian Granger
Cleaned up embedded shell and added cleanup method to InteractiveShell....
r2226 """Call this to embed IPython at the current point in your program.
The first invocation of this will create an :class:`InteractiveShellEmbed`
instance and then call it. Consecutive calls just call the already
created instance.
MinRK
expand start_ipython / embed docstrings...
r11174 If you don't want the kernel to initialize the namespace
from the scope of the surrounding function,
and/or you want to load full IPython configuration,
you probably want `IPython.start_ipython()` instead.
Brian Granger
Cleaned up embedded shell and added cleanup method to InteractiveShell....
r2226 Here is a simple example::
from IPython import embed
a = 10
b = 20
embed('First time')
c = 30
d = 40
embed
MinRK
use Singleton.instance() for embed() instead of manual global...
r8385 Full customization can be done by passing a :class:`Config` in as the
Brian Granger
Cleaned up embedded shell and added cleanup method to InteractiveShell....
r2226 config argument.
"""
Brian Granger
Complete reorganization of InteractiveShell....
r2761 config = kwargs.get('config')
header = kwargs.pop('header', u'')
Bradley M. Froehle
Allow embed(..., compile_flags=...)
r7895 compile_flags = kwargs.pop('compile_flags', None)
Brian Granger
Massive refactoring of of the core....
r2245 if config is None:
config = load_default_config()
Brian Granger
Complete reorganization of InteractiveShell....
r2761 config.InteractiveShellEmbed = config.TerminalInteractiveShell
muzuiget
embed() doesn't load default config...
r3914 kwargs['config'] = config
MinRK
use Singleton.instance() for embed() instead of manual global...
r8385 shell = InteractiveShellEmbed.instance(**kwargs)
shell(header=header, stack_depth=2, compile_flags=compile_flags)