##// END OF EJS Templates
Adde slimerjs support to JS tests...
Adde slimerjs support to JS tests This commit contains 16 more, squashed commits: Added slimerjs flag Fixed some bugs with flag code Figured out how to add arg correctly Cleanup Improvements to the test framework for FF Log to see if slimmer is actually running Added print in controller to debug Added full logging to casperjs Remove the special logging logic since it was caussing a failure remove notebook.dirty = false line in favor of overwritting onbeforeunload. Capture output for slimerjs Fixed iptestcontroller rebase issues Fixed rebase issues. Wait for notebook to load completely before testing Fixed stdout capture for slimerjs tests. Clean-up comments in util.js Added slimerjs to Travis Fixed indent .travis.yml Comment out slimerjslauncher env var. Removed zmq flag which doesn't work there anyways, it was added by me in a recent commit Fixed travis yaml, broken because of rebase

File last commit:

r13353:0ca701d5
r16828:f3ebe117
Show More
macro.py
57 lines | 1.8 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
Thomas Kluyver
Further Python 3 fixes in core.
r4742 from IPython.utils import py3compat
Brandon Parsons
saner default encoding mechanism
r6716 from IPython.utils.encoding import DEFAULT_ENCODING
Thomas Kluyver
Further Python 3 fixes in core.
r4742
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.
"""
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):
Brandon Parsons
saner default encoding mechanism
r6716 code = code.decode(enc or DEFAULT_ENCODING)
Thomas Kluyver
Refactor code-finding logic, and use it for %save and %macro as well.
r3493 self.value = code + '\n'
fperez
- thread-safety fixes...
r69 def __str__(self):
Thomas Kluyver
Further Python 3 fixes in core.
r4742 return py3compat.unicode_to_str(self.value)
Thomas Kluyver
Refactor code-finding logic, and use it for %save and %macro as well.
r3493
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)
Thomas Kluyver
Replace references to unicode and basestring
r13353 elif isinstance(other, py3compat.string_types):
Thomas Kluyver
Allow adding macros.
r3495 return Macro(self.value + other)
raise TypeError