Remove assignment to ip in test files

This is already added in globals by the test runner

IPython/core/tests/test_async_helpers.py

@@ -1,312 +1,311 b''
 """
 Test for async helpers. 
 
 Should only trigger on python 3.5+ or will have syntax errors.
 """
-
 import sys
 from itertools import chain, repeat
 import nose.tools as nt
 from textwrap import dedent, indent
 from unittest import TestCase
 from IPython.testing.decorators import skip_without
 
-ip = get_ipython()
+
 iprc = lambda x: ip.run_cell(dedent(x)).raise_error()
 iprc_nr = lambda x: ip.run_cell(dedent(x))
 
 if sys.version_info > (3, 5):
     from IPython.core.async_helpers import _should_be_async
 
     class AsyncTest(TestCase):
         def test_should_be_async(self):
             nt.assert_false(_should_be_async("False"))
             nt.assert_true(_should_be_async("await bar()"))
             nt.assert_true(_should_be_async("x = await bar()"))
             nt.assert_false(
                 _should_be_async(
                     dedent(
                         """
                 async def awaitable():
                     pass
             """
                     )
                 )
             )
 
         def _get_top_level_cases(self):
             # These are test cases that should be valid in a function
             # but invalid outside of a function.
             test_cases = []
             test_cases.append(('basic', "{val}"))
 
             # Note, in all conditional cases, I use True instead of
             # False so that the peephole optimizer won't optimize away
             # the return, so CPython will see this as a syntax error:
             #
             # while True:
             #    break
             #    return
             #
             # But not this:
             #
             # while False:
             #    return
             #
             # See https://bugs.python.org/issue1875
 
             test_cases.append(('if', dedent("""
             if True:
                 {val}
             """)))
 
             test_cases.append(('while', dedent("""
             while True:
                 {val}
                 break
             """)))
 
             test_cases.append(('try', dedent("""
             try:
                 {val}
             except:
                 pass
             """)))
 
             test_cases.append(('except', dedent("""
             try:
                 pass
             except:
                 {val}
             """)))
 
             test_cases.append(('finally', dedent("""
             try:
                 pass
             except:
                 pass
             finally:
                 {val}
             """)))
 
             test_cases.append(('for', dedent("""
             for _ in range(4):
                 {val}
             """)))
 
 
             test_cases.append(('nested', dedent("""
             if True:
                 while True:
                     {val}
                     break
             """)))
 
             test_cases.append(('deep-nested', dedent("""
             if True:
                 while True:
                     break
                     for x in range(3):
                         if True:
                             while True:
                                 for x in range(3):
                                     {val}
             """)))
 
             return test_cases
 
         def _get_ry_syntax_errors(self):
             # This is a mix of tests that should be a syntax error if
             # return or yield whether or not they are in a function
 
             test_cases = []
 
             test_cases.append(('class', dedent("""
             class V:
                 {val}
             """)))
 
             test_cases.append(('nested-class', dedent("""
             class V:
                 class C:
                     {val}
             """)))
 
             return test_cases
 
 
         def test_top_level_return_error(self):
             tl_err_test_cases = self._get_top_level_cases()
             tl_err_test_cases.extend(self._get_ry_syntax_errors())
 
             vals = ('return', 'yield', 'yield from (_ for _ in range(3))',
                     dedent('''
                         def f():
                             pass
                         return
                         '''),
                     )
 
             for test_name, test_case in tl_err_test_cases:
                 # This example should work if 'pass' is used as the value
                 with self.subTest((test_name, 'pass')):
                     iprc(test_case.format(val='pass'))
 
                 # It should fail with all the values
                 for val in vals:
                     with self.subTest((test_name, val)):
                         msg = "Syntax error not raised for %s, %s" % (test_name, val)
                         with self.assertRaises(SyntaxError, msg=msg):
                             iprc(test_case.format(val=val))
 
         def test_in_func_no_error(self):
             # Test that the implementation of top-level return/yield
             # detection isn't *too* aggressive, and works inside a function
             func_contexts = []
 
             func_contexts.append(('func', False, dedent("""
             def f():""")))
 
             func_contexts.append(('method', False, dedent("""
             class MyClass:
                 def __init__(self):
             """)))
 
             func_contexts.append(('async-func', True,  dedent("""
             async def f():""")))
 
             func_contexts.append(('async-method', True,  dedent("""
             class MyClass:
                 async def f(self):""")))
 
             func_contexts.append(('closure', False, dedent("""
             def f():
                 def g():
             """)))
 
             def nest_case(context, case):
                 # Detect indentation
                 lines = context.strip().splitlines()
                 prefix_len = 0
                 for c in lines[-1]:
                     if c != ' ':
                         break
                     prefix_len += 1
 
                 indented_case = indent(case, ' ' * (prefix_len + 4))
                 return context + '\n' + indented_case
 
             # Gather and run the tests
 
             # yield is allowed in async functions, starting in Python 3.6,
             # and yield from is not allowed in any version
             vals = ('return', 'yield', 'yield from (_ for _ in range(3))')
             async_safe = (True,
                           sys.version_info >= (3, 6),
                           False)
             vals = tuple(zip(vals, async_safe))
 
             success_tests = zip(self._get_top_level_cases(), repeat(False))
             failure_tests = zip(self._get_ry_syntax_errors(), repeat(True))
 
             tests = chain(success_tests, failure_tests)
 
             for context_name, async_func, context in func_contexts:
                 for (test_name, test_case), should_fail in tests:
                     nested_case = nest_case(context, test_case)
 
                     for val, async_safe in vals:
                         val_should_fail = (should_fail or
                                            (async_func and not async_safe))
 
                         test_id = (context_name, test_name, val)
                         cell = nested_case.format(val=val)
 
                         with self.subTest(test_id):
                             if val_should_fail:
                                 msg = ("SyntaxError not raised for %s" %
                                        str(test_id))
                                 with self.assertRaises(SyntaxError, msg=msg):
                                     iprc(cell)
 
                                     print(cell)
                             else:
                                 iprc(cell)
 
         def test_nonlocal(self):
             # fails if outer scope is not a function scope or if var not defined
             with self.assertRaises(SyntaxError):
                 iprc("nonlocal x")
                 iprc("""
                 x = 1
                 def f():
                     nonlocal x
                     x = 10000
                     yield x
                 """)
                 iprc("""
                 def f():
                     def g():
                         nonlocal x
                         x = 10000
                         yield x
                 """)
 
             # works if outer scope is a function scope and var exists
             iprc("""
             def f():
                 x = 20
                 def g():
                     nonlocal x
                     x = 10000
                     yield x
             """)
 
 
         def test_execute(self):
             iprc("""
             import asyncio
             await asyncio.sleep(0.001)
             """
             )
 
         def test_autoawait(self):
             iprc("%autoawait False")
             iprc("%autoawait True")
             iprc("""
             from asyncio import sleep
             await sleep(0.1)
             """
             )
 
         @skip_without('curio')
         def test_autoawait_curio(self):
             iprc("%autoawait curio")
 
         @skip_without('trio')
         def test_autoawait_trio(self):
             iprc("%autoawait trio")
 
         @skip_without('trio')
         def test_autoawait_trio_wrong_sleep(self):
             iprc("%autoawait trio")
             res = iprc_nr("""
             import asyncio
             await asyncio.sleep(0)
             """)
             with nt.assert_raises(TypeError):
                 res.raise_error()
 
         @skip_without('trio')
         def test_autoawait_asyncio_wrong_sleep(self):
             iprc("%autoawait asyncio")
             res = iprc_nr("""
             import trio
             await trio.sleep(0)
             """)
             with nt.assert_raises(RuntimeError):
                 res.raise_error()
 
 
         def tearDown(self):
             ip.loop_runner = "asyncio"

IPython/core/tests/test_autocall.py

@@ -1,72 +1,67 b''
 """These kinds of tests are less than ideal, but at least they run.
 
 This was an old test that was being run interactively in the top-level tests/
 directory, which we are removing.  For now putting this here ensures at least
 we do run the test, though ultimately this functionality should all be tested
 with better-isolated tests that don't rely on the global instance in iptest.
 """
 from IPython.core.splitinput import LineInfo
 from IPython.core.prefilter import AutocallChecker
 from IPython.utils import py3compat
-from IPython.testing.globalipapp import get_ipython
-
-
-ip = get_ipython()
-
 
 def doctest_autocall():
     """
     In [1]: def f1(a,b,c):
        ...:     return a+b+c
        ...:
 
     In [2]: def f2(a):
        ...:     return a + a
        ...:
 
     In [3]: def r(x):
        ...:     return True
        ...:
 
     In [4]: ;f2 a b c
     Out[4]: 'a b ca b c'
 
     In [5]: assert _ == "a b ca b c"
 
     In [6]: ,f1 a b c
     Out[6]: 'abc'
 
     In [7]: assert _ == 'abc'
 
     In [8]: print(_)
     abc
 
     In [9]: /f1 1,2,3
     Out[9]: 6
 
     In [10]: assert _ == 6
 
     In [11]: /f2 4
     Out[11]: 8
 
     In [12]: assert _ == 8
 
     In [12]: del f1, f2
 
     In [13]: ,r a
     Out[13]: True
 
     In [14]: assert _ == True
 
     In [15]: r'a'
     Out[15]: 'a'
 
     In [16]: assert _ == 'a'
     """
 
 
 def test_autocall_should_ignore_raw_strings():
     line_info = LineInfo("r'a'")
     pm = ip.prefilter_manager
     ac = AutocallChecker(shell=pm.shell, prefilter_manager=pm, config=pm.config)
     assert ac.check(line_info) is None

IPython/core/tests/test_displayhook.py

@@ -1,114 +1,112 b''
 import sys
 from IPython.testing.tools import AssertPrints, AssertNotPrints
 from IPython.core.displayhook import CapturingDisplayHook
 from IPython.utils.capture import CapturedIO
 
-ip = get_ipython()
-
 def test_output_displayed():
     """Checking to make sure that output is displayed"""
   
     with AssertPrints('2'):
        ip.run_cell('1+1', store_history=True)
       
     with AssertPrints('2'):
         ip.run_cell('1+1 # comment with a semicolon;', store_history=True)
 
     with AssertPrints('2'):
         ip.run_cell('1+1\n#commented_out_function();', store_history=True)
 
       
 def test_output_quiet():
     """Checking to make sure that output is quiet"""
   
     with AssertNotPrints('2'):
         ip.run_cell('1+1;', store_history=True)
       
     with AssertNotPrints('2'):
         ip.run_cell('1+1; # comment with a semicolon', store_history=True)
 
     with AssertNotPrints('2'):
         ip.run_cell('1+1;\n#commented_out_function()', store_history=True)
 
 def test_underscore_no_overrite_user():
     ip.run_cell('_ = 42', store_history=True)
     ip.run_cell('1+1', store_history=True)
 
     with AssertPrints('42'):
         ip.run_cell('print(_)', store_history=True)
 
     ip.run_cell('del _', store_history=True)
     ip.run_cell('6+6', store_history=True)
     with AssertPrints('12'):
         ip.run_cell('_', store_history=True)
 
 
 def test_underscore_no_overrite_builtins():
     ip.run_cell("import gettext ; gettext.install('foo')", store_history=True)
     ip.run_cell('3+3', store_history=True)
 
     with AssertPrints('gettext'):
         ip.run_cell('print(_)', store_history=True)
 
     ip.run_cell('_ = "userset"', store_history=True)
 
     with AssertPrints('userset'):
         ip.run_cell('print(_)', store_history=True)
     ip.run_cell('import builtins; del builtins._')
 
 
 def test_interactivehooks_ast_modes():
     """
     Test that ast nodes can be triggered with different modes
     """
     saved_mode = ip.ast_node_interactivity
     ip.ast_node_interactivity = 'last_expr_or_assign'
 
     try:
         with AssertPrints('2'):
             ip.run_cell('a = 1+1', store_history=True)
 
         with AssertPrints('9'):
             ip.run_cell('b = 1+8 # comment with a semicolon;', store_history=False)
 
         with AssertPrints('7'):
             ip.run_cell('c = 1+6\n#commented_out_function();', store_history=True)
 
         ip.run_cell('d = 11', store_history=True)
         with AssertPrints('12'):
             ip.run_cell('d += 1', store_history=True)
 
         with AssertNotPrints('42'):
             ip.run_cell('(u,v) = (41+1, 43-1)')
 
     finally:
         ip.ast_node_interactivity = saved_mode
 
 def test_interactivehooks_ast_modes_semi_supress():
     """
     Test that ast nodes can be triggered with different modes and suppressed
     by semicolon
     """
     saved_mode = ip.ast_node_interactivity
     ip.ast_node_interactivity = 'last_expr_or_assign'
 
     try:
         with AssertNotPrints('2'):
             ip.run_cell('x = 1+1;', store_history=True)
 
         with AssertNotPrints('7'):
             ip.run_cell('y = 1+6; # comment with a semicolon', store_history=True)
 
         with AssertNotPrints('9'):
             ip.run_cell('z = 1+8;\n#commented_out_function()', store_history=True)
 
     finally:
         ip.ast_node_interactivity = saved_mode
 
 def test_capture_display_hook_format():
     """Tests that the capture display hook conforms to the CapturedIO output format"""
     hook = CapturingDisplayHook(ip)
     hook({"foo": "bar"})
     captured = CapturedIO(sys.stdout, sys.stderr, hook.outputs)
     # Should not raise with RichOutput transformation error
     captured.outputs

IPython/core/tests/test_handlers.py

@@ -1,97 +1,95 b''
 """Tests for input handlers.
 """
 #-----------------------------------------------------------------------------
 # Module imports
 #-----------------------------------------------------------------------------
 
 # third party
 import nose.tools as nt
 
 # our own packages
 from IPython.core import autocall
 from IPython.testing import tools as tt
-from IPython.testing.globalipapp import get_ipython
 from IPython.utils import py3compat
 
 #-----------------------------------------------------------------------------
 # Globals
 #-----------------------------------------------------------------------------
 
 # Get the public instance of IPython
-ip = get_ipython()
 
 failures = []
 num_tests = 0
 
 #-----------------------------------------------------------------------------
 # Test functions
 #-----------------------------------------------------------------------------
 
 class CallableIndexable(object):
     def __getitem__(self, idx): return True
     def __call__(self, *args, **kws): return True
 
 
 class Autocallable(autocall.IPyAutocall):
     def __call__(self):
         return "called"
 
 
 def run(tests):
     """Loop through a list of (pre, post) inputs, where pre is the string
     handed to ipython, and post is how that string looks after it's been
     transformed (i.e. ipython's notion of _i)"""
     tt.check_pairs(ip.prefilter_manager.prefilter_lines, tests)
 
 
 def test_handlers():
     call_idx = CallableIndexable()
     ip.user_ns['call_idx'] = call_idx
 
     # For many of the below, we're also checking that leading whitespace
     # turns off the esc char, which it should unless there is a continuation
     # line.
     run([(i,py3compat.u_format(o)) for i,o in \
         [('"no change"', '"no change"'),             # normal
          (u"lsmagic",     "get_ipython().run_line_magic('lsmagic', '')"),   # magic
          #("a = b # PYTHON-MODE", '_i'),          # emacs -- avoids _in cache
          ]])
 
     # Objects which are instances of IPyAutocall are *always* autocalled
     autocallable = Autocallable()
     ip.user_ns['autocallable'] = autocallable
 
     # auto
     ip.magic('autocall 0')
     # Only explicit escapes or instances of IPyAutocallable should get
     # expanded
     run([
         ('len "abc"',       'len "abc"'),
         ('autocallable',    'autocallable()'),
         # Don't add extra brackets (gh-1117)
         ('autocallable()',    'autocallable()'),
         ])
     ip.magic('autocall 1')
     run([
         ('len "abc"', 'len("abc")'),
         ('len "abc";', 'len("abc");'),  # ; is special -- moves out of parens
         # Autocall is turned off if first arg is [] and the object
         # is both callable and indexable.  Like so:
         ('len [1,2]', 'len([1,2])'),      # len doesn't support __getitem__...
         ('call_idx [1]', 'call_idx [1]'), # call_idx *does*..
         ('call_idx 1', 'call_idx(1)'),
         ('len', 'len'), # only at 2 does it auto-call on single args
         ])
     ip.magic('autocall 2')
     run([
         ('len "abc"', 'len("abc")'),
         ('len "abc";', 'len("abc");'),
         ('len [1,2]', 'len([1,2])'),
         ('call_idx [1]', 'call_idx [1]'),
         ('call_idx 1', 'call_idx(1)'),
         # This is what's different:
         ('len', 'len()'), # only at 2 does it auto-call on single args
         ])
     ip.magic('autocall 1')
 
     nt.assert_equal(failures, [])

IPython/core/tests/test_iplib.py

@@ -1,254 +1,246 b''
 """Tests for the key interactiveshell module, where the main ipython class is defined.
 """
 #-----------------------------------------------------------------------------
 # Module imports
 #-----------------------------------------------------------------------------
 
 # third party
 import nose.tools as nt
 
 # our own packages
-from IPython.testing.globalipapp import get_ipython
-
-#-----------------------------------------------------------------------------
-# Globals
-#-----------------------------------------------------------------------------
-
-# Get the public instance of IPython
-ip = get_ipython()
 
 #-----------------------------------------------------------------------------
 # Test functions
 #-----------------------------------------------------------------------------
 
 def test_reset():
     """reset must clear most namespaces."""
 
     # Check that reset runs without error
     ip.reset()
 
     # Once we've reset it (to clear of any junk that might have been there from
     # other tests, we can count how many variables are in the user's namespace
     nvars_user_ns = len(ip.user_ns)
     nvars_hidden = len(ip.user_ns_hidden)
 
     # Now add a few variables to user_ns, and check that reset clears them
     ip.user_ns['x'] = 1
     ip.user_ns['y'] = 1
     ip.reset()
     
     # Finally, check that all namespaces have only as many variables as we
     # expect to find in them:
     nt.assert_equal(len(ip.user_ns), nvars_user_ns)
     nt.assert_equal(len(ip.user_ns_hidden), nvars_hidden)
 
 
 # Tests for reporting of exceptions in various modes, handling of SystemExit,
 # and %tb functionality.  This is really a mix of testing ultraTB and interactiveshell.
 
 def doctest_tb_plain():
     """
 In [18]: xmode plain
 Exception reporting mode: Plain
 
 In [19]: run simpleerr.py
 Traceback (most recent call last):
   ...line 32, in <module>
     bar(mode)
   ...line 16, in bar
     div0()
   ...line 8, in div0
     x/y
 ZeroDivisionError: ...
     """
 
 
 def doctest_tb_context():
     """
 In [3]: xmode context
 Exception reporting mode: Context
 
 In [4]: run simpleerr.py
 ---------------------------------------------------------------------------
 ZeroDivisionError                         Traceback (most recent call last)
 <BLANKLINE>
 ... in <module>
      30         mode = 'div'
      31 
 ---> 32     bar(mode)
 <BLANKLINE>
 ... in bar(mode)
      14     "bar"
      15     if mode=='div':
 ---> 16         div0()
      17     elif mode=='exit':
      18         try:
 <BLANKLINE>
 ... in div0()
       6     x = 1
       7     y = 0
 ----> 8     x/y
       9 
      10 def sysexit(stat, mode):
 <BLANKLINE>
 ZeroDivisionError: ...
 """
 
 
 def doctest_tb_verbose():
     """
 In [5]: xmode verbose
 Exception reporting mode: Verbose
 
 In [6]: run simpleerr.py
 ---------------------------------------------------------------------------
 ZeroDivisionError                         Traceback (most recent call last)
 <BLANKLINE>
 ... in <module>
      30         mode = 'div'
      31 
 ---> 32     bar(mode)
         global bar = <function bar at ...>
         global mode = 'div'
 <BLANKLINE>
 ... in bar(mode='div')
      14     "bar"
      15     if mode=='div':
 ---> 16         div0()
         global div0 = <function div0 at ...>
      17     elif mode=='exit':
      18         try:
 <BLANKLINE>
 ... in div0()
       6     x = 1
       7     y = 0
 ----> 8     x/y
         x = 1
         y = 0
       9 
      10 def sysexit(stat, mode):
 <BLANKLINE>
 ZeroDivisionError: ...
       """
 
 def doctest_tb_sysexit():
     """
 In [17]: %xmode plain
 Exception reporting mode: Plain
 
 In [18]: %run simpleerr.py exit
 An exception has occurred, use %tb to see the full traceback.
 SystemExit: (1, 'Mode = exit')
 
 In [19]: %run simpleerr.py exit 2
 An exception has occurred, use %tb to see the full traceback.
 SystemExit: (2, 'Mode = exit')
 
 In [20]: %tb
 Traceback (most recent call last):
   File ... in <module>
     bar(mode)
   File ... line 22, in bar
     sysexit(stat, mode)
   File ... line 11, in sysexit
     raise SystemExit(stat, 'Mode = %s' % mode)
 SystemExit: (2, 'Mode = exit')
 
 In [21]: %xmode context
 Exception reporting mode: Context
 
 In [22]: %tb
 ---------------------------------------------------------------------------
 SystemExit                                Traceback (most recent call last)
 <BLANKLINE>
 ...<module>
      30         mode = 'div'
      31 
 ---> 32     bar(mode)
 <BLANKLINE>
 ...bar(mode)
      20         except:
      21             stat = 1
 ---> 22         sysexit(stat, mode)
      23     else:
      24         raise ValueError('Unknown mode')
 <BLANKLINE>
 ...sysexit(stat, mode)
       9 
      10 def sysexit(stat, mode):
 ---> 11     raise SystemExit(stat, 'Mode = %s' % mode)
      12 
      13 def bar(mode):
 <BLANKLINE>
 SystemExit: (2, 'Mode = exit')
 
 In [23]: %xmode verbose
 Exception reporting mode: Verbose
 
 In [24]: %tb
 ---------------------------------------------------------------------------
 SystemExit                                Traceback (most recent call last)
 <BLANKLINE>
 ... in <module>
      30         mode = 'div'
      31 
 ---> 32     bar(mode)
         global bar = <function bar at ...>
         global mode = 'exit'
 <BLANKLINE>
 ... in bar(mode='exit')
      20         except:
      21             stat = 1
 ---> 22         sysexit(stat, mode)
         global sysexit = <function sysexit at ...>
         stat = 2
         mode = 'exit'
      23     else:
      24         raise ValueError('Unknown mode')
 <BLANKLINE>
 ... in sysexit(stat=2, mode='exit')
       9 
      10 def sysexit(stat, mode):
 ---> 11     raise SystemExit(stat, 'Mode = %s' % mode)
         global SystemExit = undefined
         stat = 2
         mode = 'exit'
      12 
      13 def bar(mode):
 <BLANKLINE>
 SystemExit: (2, 'Mode = exit')
     """
 
 
 def test_run_cell():
     import textwrap
     ip.run_cell('a = 10\na+=1')
     ip.run_cell('assert a == 11\nassert 1')
 
     nt.assert_equal(ip.user_ns['a'], 11)
     complex = textwrap.dedent("""
     if 1:
         print "hello"
         if 1:
             print "world"
         
     if 2:
         print "foo"
 
     if 3:
         print "bar"
 
     if 4:
         print "bar"
     
     """)
     # Simply verifies that this kind of input is run
     ip.run_cell(complex)
     
 
 def test_db():
     """Test the internal database used for variable persistence."""
     ip.db['__unittest_'] = 12
     nt.assert_equal(ip.db['__unittest_'], 12)
     del ip.db['__unittest_']
     assert '__unittest_' not in ip.db

IPython/core/tests/test_logger.py

@@ -1,32 +1,30 b''
 # -*- coding: utf-8 -*-
 """Test IPython.core.logger"""
 
 import os.path
 
 import nose.tools as nt
 from IPython.utils.tempdir import TemporaryDirectory
 
-_ip = get_ipython()
-
 def test_logstart_inaccessible_file():
     try:
         _ip.logger.logstart(logfname="/")   # Opening that filename will fail.
     except IOError:
         pass
     else:
         nt.assert_true(False)           # The try block should never pass.
     
     try:
         _ip.run_cell("a=1")                 # Check it doesn't try to log this
     finally:
         _ip.logger.log_active = False  # If this fails, don't let later tests fail
 
 def test_logstart_unicode():
     with TemporaryDirectory() as tdir:
         logfname = os.path.join(tdir, "test_unicode.log")
         _ip.run_cell("'abc€'")
         try:
             _ip.magic("logstart -to %s" % logfname)
             _ip.run_cell("'abc€'")
         finally:
             _ip.logger.logstop()

IPython/core/tests/test_prefilter.py

@@ -1,119 +1,117 b''
 """Tests for input manipulation machinery."""
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 import nose.tools as nt
 
 from IPython.core.prefilter import AutocallChecker
-from IPython.testing.globalipapp import get_ipython
 
 #-----------------------------------------------------------------------------
 # Tests
 #-----------------------------------------------------------------------------
-ip = get_ipython()
 
 def test_prefilter():
     """Test user input conversions"""
 
     # pairs of (raw, expected correct) input
     pairs = [ ('2+2','2+2'),
              ]
 
     for raw, correct in pairs:
         nt.assert_equal(ip.prefilter(raw), correct)
 
 def test_prefilter_shadowed():
     def dummy_magic(line): pass
 
     prev_automagic_state = ip.automagic
     ip.automagic = True
     ip.autocall = 0
 
     try:
         # These should not be transformed - they are shadowed by other names
         for name in ['if', 'zip', 'get_ipython']: # keyword, builtin, global
             ip.register_magic_function(dummy_magic, magic_name=name)
             res = ip.prefilter(name+' foo')
             nt.assert_equal(res, name+' foo')
             del ip.magics_manager.magics['line'][name]
 
         # These should be transformed
         for name in ['fi', 'piz', 'nohtypi_teg']:
             ip.register_magic_function(dummy_magic, magic_name=name)
             res = ip.prefilter(name+' foo')
             nt.assert_not_equal(res, name+' foo')
             del ip.magics_manager.magics['line'][name]
 
     finally:
         ip.automagic = prev_automagic_state
 
 def test_autocall_binops():
     """See https://github.com/ipython/ipython/issues/81"""
     ip.magic('autocall 2')
     f = lambda x: x
     ip.user_ns['f'] = f
     try:
         nt.assert_equal(ip.prefilter('f 1'),'f(1)')
         for t in ['f +1', 'f -1']:
             nt.assert_equal(ip.prefilter(t), t)
 
         # Run tests again with a more permissive exclude_regexp, which will
         # allow transformation of binary operations ('f -1' -> 'f(-1)').
         pm = ip.prefilter_manager
         ac = AutocallChecker(shell=pm.shell, prefilter_manager=pm,
                              config=pm.config)
         try:
             ac.priority = 1
             ac.exclude_regexp = r'^[,&^\|\*/]|^is |^not |^in |^and |^or '
             pm.sort_checkers()
 
             nt.assert_equal(ip.prefilter('f -1'), 'f(-1)')
             nt.assert_equal(ip.prefilter('f +1'), 'f(+1)')
         finally:
             pm.unregister_checker(ac)
     finally:
         ip.magic('autocall 0')
         del ip.user_ns['f']
 
 
 def test_issue_114():
     """Check that multiline string literals don't expand as magic
     see http://github.com/ipython/ipython/issues/114"""
 
     template = '"""\n%s\n"""'
     # Store the current value of multi_line_specials and turn it off before
     # running test, since it could be true (case in which the test doesn't make
     # sense, as multiline string literals *will* expand as magic in that case).
     msp = ip.prefilter_manager.multi_line_specials
     ip.prefilter_manager.multi_line_specials = False
     try:
         for mgk in ip.magics_manager.lsmagic()['line']:
             raw = template % mgk
             nt.assert_equal(ip.prefilter(raw), raw)
     finally:
         ip.prefilter_manager.multi_line_specials = msp
 
 
 def test_prefilter_attribute_errors():
     """Capture exceptions thrown by user objects on attribute access.
 
     See http://github.com/ipython/ipython/issues/988."""
 
     class X(object):
         def __getattr__(self, k):
             raise ValueError('broken object')
         def __call__(self, x):
             return x
 
     # Create a callable broken object
     ip.user_ns['x'] = X()
     ip.magic('autocall 2')
     try:
         # Even if x throws an attribute error when looking at its rewrite
         # attribute, we should not crash.  So the test here is simply making
         # the prefilter call and not having an exception.
         ip.prefilter('x 1')
     finally:
         del ip.user_ns['x']
         ip.magic('autocall 0')

IPython/core/tests/test_prompts.py

@@ -1,34 +1,30 b''
 # -*- coding: utf-8
 """Tests for prompt generation."""
 
 import unittest
 
 from IPython.core.prompts import  LazyEvaluate
-from IPython.testing.globalipapp import get_ipython
-
-ip = get_ipython()
-
 
 class PromptTests(unittest.TestCase):
     def test_lazy_eval_unicode(self):
         u = u'ünicødé'
         lz = LazyEvaluate(lambda : u)
         self.assertEqual(str(lz), u)
         self.assertEqual(format(lz), u)
     
     def test_lazy_eval_nonascii_bytes(self):
         u = u'ünicødé'
         b = u.encode('utf8')
         lz = LazyEvaluate(lambda : b)
         # unicode(lz) would fail
         self.assertEqual(str(lz), str(b))
         self.assertEqual(format(lz), str(b))
     
     def test_lazy_eval_float(self):
         f = 0.503
         lz = LazyEvaluate(lambda : f)
         
         self.assertEqual(str(lz), str(f))
         self.assertEqual(format(lz), str(f))
         self.assertEqual(format(lz, '.1'), '0.5')