##// END OF EJS Templates
Move crash handling to the application level and simplify class structure....
Move crash handling to the application level and simplify class structure. Starting to try to take real advantage of the refactoring, to have generic crash handling. This also lets us initialize the app without needing all the self.attempt() wrappers, since now there's a good system-wide crash handler at the app level (not inside the shell instance). I didn't yet remove the attempt() method because we may have occasional uses for it (we still do, but in one place only). I also removed some extra class layers that weren't quite needed. Creating classes solely for the purpose of passing parameters makes the code (IMO) harder to understand, I kept getting lost in parts of the class hierarchy. I think these changes provide the same flexibility but with easier to follow code (less things to remember, basically). What I tried to do was to use argument passing instead of inheritance for all cases I saw where the inheritance wasn't really adding new functionality. In some cases, this actually allowed me to remove methods that were effectively duplicated in the subclasses.

File last commit:

r2205:8ce57664
r2403:08d6ac78
Show More
macro.py
41 lines | 1.3 KiB | text/x-python | PythonLexer
fperez
- thread-safety fixes...
r69 """Support for interactive macros in IPython"""
#*****************************************************************************
# Copyright (C) 2001-2005 Fernando Perez <fperez@colorado.edu>
#
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#*****************************************************************************
Brian Granger
genutils.py => utils/genutils.py and updated imports and tests.
r2023 from IPython.utils.genutils import Term
Brian Granger
Continuing a massive refactor of everything.
r2205 from IPython.core.autocall import IPyAutocall
vivainio
Macros are now simple callables, no special handling in Prompt.py
r653
vivainio
IPyAutocall machinery
r654 class Macro(IPyAutocall):
fperez
- thread-safety fixes...
r69 """Simple class to store the value of macros as strings.
vivainio
Macros are now simple callables, no special handling in Prompt.py
r653 Macro is just a callable that executes a string of IPython
input when called.
vivainio
macros are pickleable again. _margv has possible args to macro
r655
Args to macro are available in _margv list if you need them.
vivainio
Macros are now simple callables, no special handling in Prompt.py
r653 """
fperez
- thread-safety fixes...
r69
def __init__(self,data):
# store the macro value, as a single string which can be evaluated by
# runlines()
self.value = ''.join(data).rstrip()+'\n'
vivainio
Macros are now simple callables, no special handling in Prompt.py
r653
fperez
- thread-safety fixes...
r69 def __str__(self):
return self.value
vivainio
Macro now has more informative __repr__
r453
def __repr__(self):
vivainio
Macros are now simple callables, no special handling in Prompt.py
r653 return 'IPython.macro.Macro(%s)' % repr(self.value)
vivainio
macros are pickleable again. _margv has possible args to macro
r655 def __call__(self,*args):
vivainio
Macros are now simple callables, no special handling in Prompt.py
r653 Term.cout.flush()
vivainio
macros are pickleable again. _margv has possible args to macro
r655 self._ip.user_ns['_margv'] = args
self._ip.runlines(self.value)
vivainio
%store for macros works again
r663 def __getstate__(self):
vivainio
macros are pickleable again. _margv has possible args to macro
r655 """ needed for safe pickling via %store """
Fernando Perez
Remove svn-style $Id marks from docstrings and Release imports....
r1853 return {'value': self.value}