##// 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:

r6998:d2a11a76
r7011:61eb2ffe merge
Show More
test_splitinput.py
35 lines | 1.2 KiB | text/x-python | PythonLexer
/ IPython / core / tests / test_splitinput.py
Thomas Kluyver
Update split_user_input unicode test.
r4769 # coding: utf-8
Thomas Kluyver
Reuse common code for inputsplitter and prefilter.
r4746 from IPython.core.splitinput import split_user_input
from IPython.testing import tools as tt
Thomas Kluyver
Update split_user_input unicode test.
r4769 from IPython.utils import py3compat
Thomas Kluyver
Reuse common code for inputsplitter and prefilter.
r4746
tests = [
('x=1', ('', '', 'x', '=1')),
('?', ('', '?', '', '')),
('??', ('', '??', '', '')),
(' ?', (' ', '?', '', '')),
(' ??', (' ', '??', '', '')),
('??x', ('', '??', 'x', '')),
('?x=1', ('', '?', 'x', '=1')),
('!ls', ('', '!', 'ls', '')),
(' !ls', (' ', '!', 'ls', '')),
('!!ls', ('', '!!', 'ls', '')),
(' !!ls', (' ', '!!', 'ls', '')),
(',ls', ('', ',', 'ls', '')),
(';ls', ('', ';', 'ls', '')),
(' ;ls', (' ', ';', 'ls', '')),
('f.g(x)', ('', '', 'f.g', '(x)')),
('f.g (x)', ('', '', 'f.g', '(x)')),
Fernando Perez
Fix split_user_input to correctly handle %% escape for cell magics.
r6998 ('?%hist1', ('', '?', '%hist1', '')),
('?%%hist2', ('', '?', '%%hist2', '')),
('??%hist3', ('', '??', '%hist3', '')),
('??%%hist4', ('', '??', '%%hist4', '')),
Thomas Kluyver
Reuse common code for inputsplitter and prefilter.
r4746 ('?x*', ('', '?', 'x*', '')),
]
Thomas Kluyver
Update split_user_input unicode test.
r4769 if py3compat.PY3:
tests.append((u"Pérez Fernando", (u'', u'', u'Pérez', u'Fernando')))
else:
tests.append((u"Pérez Fernando", (u'', u'', u'P', u'érez Fernando')))
Thomas Kluyver
Reuse common code for inputsplitter and prefilter.
r4746
def test_split_user_input():
return tt.check_pairs(split_user_input, tests)