OutputTrap.py => core/outputtrap.py and updated imports.

IPython/core/ipmaker.py

@@ -47,7 +47,7 b' from pprint import pprint'
 from IPython.utils import DPyGetOpt
 from IPython import Release
 from IPython.utils.ipstruct import Struct
-from IPython.OutputTrap import OutputTrap
+from IPython.core.outputtrap import OutputTrap
 from IPython.config.configloader import ConfigLoader
 from IPython.core.iplib import InteractiveShell
 from IPython.usage import cmd_line_usage,interactive_usage

IPython/core/tests/test_imports.py

@@ -43,4 +43,6 b' def test_import_magic():'
 def test_import_oinspect():
     from IPython.core import oinspect
 
+def test_import_outputtrap():
+    from IPython.core import outputtrap
 

IPython/testing/iptest.py

@@ -204,7 +204,7 b' def make_runners():'
        'generics.py', 'genutils.py', 'history.py', 'hooks.py', 'ipapi.py',
        'iplib.py', 'ipmaker.py', 'ipstruct.py', 'Itpl.py',
        'logger.py', 'macro.py', 'magic.py', 'oinspect.py',
-       'OutputTrap.py', 'platutils.py', 'prefilter.py', 'Prompts.py',
+       'outputtrap.py', 'platutils.py', 'prefilter.py', 'Prompts.py',
        'PyColorize.py', 'Release.py', 'rlineimpl.py', 'shadowns.py',
        'shellglobals.py', 'strdispatch.py', 'twshell.py',
        'ultraTB.py', 'upgrade_dir.py', 'usage.py', 'wildcard.py',