IPython.testing.decorators is imported as dec everywhere else, unify.

Signed-off-by: Thomas Spura <[e-mail]>

IPython/core/tests/test_application.py

@@ -1,50 +1,50 b''
 # coding: utf-8
 """Tests for IPython.core.application"""
 
 import os
 import tempfile
 
 from IPython.core.application import BaseIPythonApplication
-from IPython.testing import decorators as testdec
+from IPython.testing import decorators as dec
 from IPython.utils import py3compat
 
[e-mail]_unicode_paths
[e-mail]_unicode_paths
 def test_unicode_cwd():
     """Check that IPython starts with non-ascii characters in the path."""
     wd = tempfile.mkdtemp(suffix=u"€")
     
     old_wd = os.getcwdu()
     os.chdir(wd)
     #raise Exception(repr(os.getcwdu()))
     try:
         app = BaseIPythonApplication()
         # The lines below are copied from Application.initialize()
         app.init_profile_dir()
         app.init_config_files()
         app.load_config_file(suppress_errors=False)
     finally:
         os.chdir(old_wd)
 
[e-mail]_unicode_paths
[e-mail]_unicode_paths
 def test_unicode_ipdir():
     """Check that IPython starts with non-ascii characters in the IP dir."""
     ipdir = tempfile.mkdtemp(suffix=u"€")
     
     # Create the config file, so it tries to load it.
     with open(os.path.join(ipdir, 'ipython_config.py'), "w") as f:
         pass
     
     old_ipdir1 = os.environ.pop("IPYTHONDIR", None)
     old_ipdir2 = os.environ.pop("IPYTHON_DIR", None)
     os.environ["IPYTHONDIR"] = py3compat.unicode_to_str(ipdir, "utf-8")
     try:
         app = BaseIPythonApplication()
         # The lines below are copied from Application.initialize()
         app.init_profile_dir()
         app.init_config_files()
         app.load_config_file(suppress_errors=False)
     finally:
         if old_ipdir1:
             os.environ["IPYTHONDIR"] = old_ipdir1
         if old_ipdir2:
             os.environ["IPYTHONDIR"] = old_ipdir2

IPython/deathrow/oldfrontend/tests/test_process.py

@@ -1,68 +1,68 b''
 # encoding: utf-8
 """
 Test process execution and IO redirection.
 """
 
 __docformat__ = "restructuredtext en"
 
 #-----------------------------------------------------------------------------
 #  Copyright (C) 2008-2011  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is
 #  in the file COPYING, distributed as part of this software.
 #-----------------------------------------------------------------------------
 
 from cStringIO import StringIO
 from time import sleep
 import sys
 
 from IPython.frontend.process import PipedProcess
-from IPython.testing import decorators as testdec
+from IPython.testing import decorators as dec
 
 
 def test_capture_out():
     """ A simple test to see if we can execute a process and get the output.
     """
     s = StringIO()
     p = PipedProcess('echo 1', out_callback=s.write, )
     p.start()
     p.join()
     result = s.getvalue().rstrip()
     assert result == '1'
 
 
 def test_io():
     """ Checks that we can send characters on stdin to the process.
     """
     s = StringIO()
     p = PipedProcess(sys.executable + ' -c "a = raw_input(); print a"',
                             out_callback=s.write, )
     p.start()
     test_string = '12345\n'
     while not hasattr(p, 'process'):
         sleep(0.1)
     p.process.stdin.write(test_string)
     p.join()
     result = s.getvalue()
     assert result == test_string
 
 
[e-mail]_win32
[e-mail]_win32
 def test_kill():
     """ Check that we can kill a process, and its subprocess.
     """
     s = StringIO()
     p = PipedProcess(sys.executable + ' -c "a = raw_input();"',
                             out_callback=s.write, )
     p.start()
     while not hasattr(p, 'process'):
         sleep(0.1)
     p.process.kill()
     assert p.process.poll() is not None
 
 
 if __name__ == '__main__':
     test_capture_out()
     test_io()
     test_kill()