##// END OF EJS Templates
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ipython branch. This is not a true merge in the formal sense because all history is not coming over with the files. For a detailed history of the added files, please see the ipython1-dev branch or the svn repository on scipy.org that ipython1-dev came from. More specifically, here is what I have done in this commit: 1) Moved the following by hand ipython1.config -> IPython.config ipython1.kernel -> IPython.kernel ipython1.external -> IPython.external ipython1.core -> IPython.kernel.core ipython1.testutils -> IPython.testing ipython1.tools -> IPython.tools 2) Moved IPython.tools.guid -> IPython1.external.guid 3) Renamed: ipython1 -> IPython IPython.core -> IPython.kernel.core IPython.testutils -> IPython.testing 4) Then did a "bzr add" for all the new stuff. That is all folks!

File last commit:

r663:61a6b39e
r1234:52b55407
Show More
macro.py
43 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.
#*****************************************************************************
vivainio
Macros are now simple callables, no special handling in Prompt.py
r653 import IPython.ipapi
from IPython.genutils import Term
vivainio
IPyAutocall machinery
r654 from IPython.ipapi 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 """
return {'value': self.value}