From 01511c3bf34692e2d6e7efff30cd2943aca366e5 2009-07-02 16:21:53
From: Brian Granger <ellisonbg@gmail.com>
Date: 2009-07-02 16:21:53
Subject: [PATCH] OutputTrap.py => core/outputtrap.py and updated imports.

---

diff --git a/IPython/core/ipmaker.py b/IPython/core/ipmaker.py
index eba389b..02a9aa6 100644
--- a/IPython/core/ipmaker.py
+++ b/IPython/core/ipmaker.py
@@ -47,7 +47,7 @@ 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
diff --git a/IPython/OutputTrap.py b/IPython/core/outputtrap.py
similarity index 100%
rename from IPython/OutputTrap.py
rename to IPython/core/outputtrap.py
diff --git a/IPython/core/tests/test_imports.py b/IPython/core/tests/test_imports.py
index 4a25569..609a977 100644
--- a/IPython/core/tests/test_imports.py
+++ b/IPython/core/tests/test_imports.py
@@ -43,4 +43,6 @@ def test_import_magic():
 def test_import_oinspect():
     from IPython.core import oinspect
 
+def test_import_outputtrap():
+    from IPython.core import outputtrap
 
diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py
index f703581..b866cf5 100644
--- a/IPython/testing/iptest.py
+++ b/IPython/testing/iptest.py
@@ -204,7 +204,7 @@ 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',