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

r5390:c82649ea
r7011:61eb2ffe merge
Show More
test_compilerop.py
75 lines | 2.3 KiB | text/x-python | PythonLexer
/ IPython / core / tests / test_compilerop.py
Thomas Kluyver
Add file encoding declarations to two tests.
r3449 # coding: utf-8
Fernando Perez
Complete implementation of interactive traceback support....
r3175 """Tests for the compilerop module.
"""
#-----------------------------------------------------------------------------
Matthias BUSSONNIER
update copyright to 2011/20xx-2011...
r5390 # Copyright (C) 2010-2011 The IPython Development Team.
Fernando Perez
Complete implementation of interactive traceback support....
r3175 #
# Distributed under the terms of the BSD License.
#
# The full license is in the file COPYING.txt, distributed with this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
from __future__ import print_function
# Stdlib imports
import linecache
Thomas Kluyver
Tweak code with suggestions from yesterday.
r3458 import sys
Fernando Perez
Complete implementation of interactive traceback support....
r3175
# Third-party imports
import nose.tools as nt
# Our own imports
from IPython.core import compilerop
Thomas Kluyver
Start using py3compat module.
r4731 from IPython.utils import py3compat
Fernando Perez
Complete implementation of interactive traceback support....
r3175
#-----------------------------------------------------------------------------
# Test functions
#-----------------------------------------------------------------------------
def test_code_name():
code = 'x=1'
name = compilerop.code_name(code)
nt.assert_true(name.startswith('<ipython-input-0'))
def test_code_name2():
code = 'x=1'
name = compilerop.code_name(code, 9)
nt.assert_true(name.startswith('<ipython-input-9'))
Thomas Kluyver
Fix core and lib tests so that all tests pass.
r3530 def test_cache():
Fernando Perez
Complete implementation of interactive traceback support....
r3175 """Test the compiler correctly compiles and caches inputs
"""
cp = compilerop.CachingCompiler()
ncache = len(linecache.cache)
Thomas Kluyver
Fix core and lib tests so that all tests pass.
r3530 cp.cache('x=1')
Fernando Perez
Complete implementation of interactive traceback support....
r3175 nt.assert_true(len(linecache.cache) > ncache)
Thomas Kluyver
Tweak code with suggestions from yesterday.
r3458 def setUp():
# Check we're in a proper Python 2 environment (some imports, such
# as GTK, can change the default encoding, which can hide bugs.)
Thomas Kluyver
Start using py3compat module.
r4731 nt.assert_equal(sys.getdefaultencoding(), "utf-8" if py3compat.PY3 else "ascii")
Thomas Kluyver
Tweak code with suggestions from yesterday.
r3458
Thomas Kluyver
Fix core and lib tests so that all tests pass.
r3530 def test_cache_unicode():
Thomas Kluyver
Moved unicode tests into main test suite. Reverified that both fail if the fixes in previous commits are undone.
r3447 cp = compilerop.CachingCompiler()
ncache = len(linecache.cache)
Thomas Kluyver
Fix core and lib tests so that all tests pass.
r3530 cp.cache(u"t = 'žćčšđ'")
Thomas Kluyver
Moved unicode tests into main test suite. Reverified that both fail if the fixes in previous commits are undone.
r3447 nt.assert_true(len(linecache.cache) > ncache)
Fernando Perez
Complete implementation of interactive traceback support....
r3175
def test_compiler_check_cache():
"""Test the compiler properly manages the cache.
"""
# Rather simple-minded tests that just exercise the API
cp = compilerop.CachingCompiler()
Thomas Kluyver
Fix core and lib tests so that all tests pass.
r3530 cp.cache('x=1', 99)
Fernando Perez
Complete implementation of interactive traceback support....
r3175 # Ensure now that after clearing the cache, our entries survive
cp.check_cache()
for k in linecache.cache:
if k.startswith('<ipython-input-99'):
break
else:
raise AssertionError('Entry for input-99 missing from linecache')