##// END OF EJS Templates
Merge pull request #1732 from fperez/cellmagics...
Merge pull request #1732 from fperez/cellmagics Refactoring of the magics system and implementation of cell magics. This PR completely refactors the magic system, finally moving the magic objects to standalone, independent objects instead of being the mixin class we'd had since the beginning of IPython. Now, a separate base class is provided in IPython.core.magic.Magics that users can subclass to create their own magics. Decorators are also provided to create magics from simple functions without the need for object orientation. All builtin magics now exist in a few subclasses that group together related functionality, and the new IPython.core.magics package has been created to organize this into smaller files. This cleanup was the last major piece of deep refactoring needed from the original 2001 codebase. Secondly, this PR introduces a new type of magic function, prefixed with `%%` instead of `%`, which operates at the cell level. A cell magic receives two arguments: the line it is called on (like a line magic) and the body of the cell below it. Cell magics are most natural in the notebook, but they also work in the terminal and qt console, with the usual approach of using a blank line to signal cell termination. This PR closes #1611, or IPEP 1, where the design had been discussed.

File last commit:

r4734:e36691ad
r7011:61eb2ffe merge
Show More
tclass.py
35 lines | 959 B | text/x-python | PythonLexer
Fernando Perez
Massive amount of work to improve the test suite, restores doctests....
r2414 """Simple script to be run *twice*, to check reference counting bugs.
Fernando Perez
Cleanup testing machinery.
r1851
Fernando Perez
Massive amount of work to improve the test suite, restores doctests....
r2414 See test_run for details."""
Fernando Perez
Cleanup testing machinery.
r1851
Thomas Kluyver
Start using py3compat module.
r4731 from __future__ import print_function
Fernando Perez
Massive amount of work to improve the test suite, restores doctests....
r2414 import sys
Fernando Perez
Fix bug: https://bugs.launchpad.net/ipython/+bug/269966...
r1856
Fernando Perez
Massive amount of work to improve the test suite, restores doctests....
r2414 # We want to ensure that while objects remain available for immediate access,
# objects from *previous* runs of the same script get collected, to avoid
# accumulating massive amounts of old references.
Fernando Perez
Fix bug: https://bugs.launchpad.net/ipython/+bug/269966...
r1856 class C(object):
def __init__(self,name):
self.name = name
Thomas Kluyver
Start using py3compat module.
r4731 self.p = print
Thomas Kluyver
Shell's reset method clears namespace from last %run command.
r3762 self.flush_stdout = sys.stdout.flush
Fernando Perez
Fix bug: https://bugs.launchpad.net/ipython/+bug/269966...
r1856
def __del__(self):
Thomas Kluyver
Start using py3compat module.
r4731 self.p('tclass.py: deleting object:',self.name)
Thomas Kluyver
Shell's reset method clears namespace from last %run command.
r3762 self.flush_stdout()
Fernando Perez
Massive amount of work to improve the test suite, restores doctests....
r2414
Fernando Perez
Fix bug: https://bugs.launchpad.net/ipython/+bug/269966...
r1856 try:
name = sys.argv[1]
except IndexError:
pass
else:
Fernando Perez
- Make ipdoctest a little cleaner by giving it separate option names....
r1910 if name.startswith('C'):
c = C(name)
Fernando Perez
Massive amount of work to improve the test suite, restores doctests....
r2414
#print >> sys.stderr, "ARGV:", sys.argv # dbg
Fernando Perez
Fix extensions test suite (small, but now it runs and passes!)
r2415
# This next print statement is NOT debugging, we're making the check on a
# completely separate process so we verify by capturing stdout:
Thomas Kluyver
Repair various failures in the test suite.
r4734 print('ARGV 1-:', sys.argv[1:])
Fernando Perez
Robustness fixes in test suite machinery....
r2494 sys.stdout.flush()