##// END OF EJS Templates
add message tracking to client, add/improve tests
add message tracking to client, add/improve tests

File last commit:

r3495:ed8085ac
r3654:62f8971b
Show More
macro.py
60 lines | 1.9 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.
#*****************************************************************************
Thomas Kluyver
Refactor code-finding logic, and use it for %save and %macro as well.
r3493 import re
import sys
Brian Granger
Changing how IPython.utils.io.Term is handled....
r2775 import IPython.utils.io
vivainio
Macros are now simple callables, no special handling in Prompt.py
r653
Thomas Kluyver
Refactor code-finding logic, and use it for %save and %macro as well.
r3493 coding_declaration = re.compile(r"#\s*coding[:=]\s*([-\w.]+)")
Thomas Kluyver
Initial code to expand macro in prefilter. Doesn't quite work right with multi-line macros.
r3406 class Macro(object):
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
Thomas Kluyver
Reworking magic %hist, %macro and %edit commands to work with new history system.
r3380 def __init__(self,code):
MinRK
merge review fperez-execution-refactor
r3124 """store the macro value, as a single string which can be executed"""
Thomas Kluyver
Refactor code-finding logic, and use it for %save and %macro as well.
r3493 lines = []
enc = None
for line in code.splitlines():
coding_match = coding_declaration.match(line)
if coding_match:
enc = coding_match.group(1)
else:
lines.append(line)
code = "\n".join(lines)
if isinstance(code, bytes):
code = code.decode(enc or sys.getdefaultencoding())
self.value = code + '\n'
fperez
- thread-safety fixes...
r69 def __str__(self):
Thomas Kluyver
Refactor code-finding logic, and use it for %save and %macro as well.
r3493 enc = sys.stdin.encoding or sys.getdefaultencoding()
return self.value.encode(enc, "replace")
def __unicode__(self):
fperez
- thread-safety fixes...
r69 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
%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}
Thomas Kluyver
Allow adding macros.
r3495
def __add__(self, other):
if isinstance(other, Macro):
return Macro(self.value + other.value)
elif isinstance(other, basestring):
return Macro(self.value + other)
raise TypeError