From 4bd0881d23696ddf178faf50df78cd0cb0325bbf 2009-07-02 16:19:02
From: Brian Granger <ellisonbg@gmail.com>
Date: 2009-07-02 16:19:02
Subject: [PATCH] OInspect.py => core/oinspect.py and imports updated.

---

diff --git a/IPython/core/iplib.py b/IPython/core/iplib.py
index da47531..ba5ba0d 100644
--- a/IPython/core/iplib.py
+++ b/IPython/core/iplib.py
@@ -45,8 +45,8 @@ import tempfile
 
 # IPython's own modules
 #import IPython
-from IPython import OInspect,PyColorize,ultraTB
-from IPython.core import debugger
+from IPython import PyColorize,ultraTB
+from IPython.core import debugger, oinspect
 from IPython.Extensions import pickleshare
 from IPython.core.fakemodule import FakeModule, init_fakemod_dict
 from IPython.external.Itpl import ItplNS
@@ -844,7 +844,7 @@ class InteractiveShell(object,Magic):
         rc = self.rc
 
         # Object inspector
-        self.inspector = OInspect.Inspector(OInspect.InspectColors,
+        self.inspector = oinspect.Inspector(oinspect.InspectColors,
                                             PyColorize.ANSICodeColors,
                                             'NoColor',
                                             rc.object_info_string_level)
diff --git a/IPython/core/magic.py b/IPython/core/magic.py
index 0e85511..668bdaf 100644
--- a/IPython/core/magic.py
+++ b/IPython/core/magic.py
@@ -43,8 +43,8 @@ except ImportError:
 
 # Homebrewed
 import IPython
-from IPython import OInspect, wildcard
-from IPython.core import debugger
+from IPython import wildcard
+from IPython.core import debugger, oinspect
 from IPython.core.fakemodule import FakeModule
 from IPython.external.Itpl import Itpl, itpl, printpl,itplns
 from IPython.PyColorize import Parser
@@ -1562,7 +1562,7 @@ Currently the magic system has the following functions:\n"""
             filename = file_finder(arg_lst[0])
         except IndexError:
             warn('you must provide at least a filename.')
-            print '\n%run:\n',OInspect.getdoc(self.magic_run)
+            print '\n%run:\n',oinspect.getdoc(self.magic_run)
             return
         except IOError,msg:
             error(msg)
@@ -2641,7 +2641,7 @@ Defaulting color scheme to 'NoColor'"""
         try:
             alias,cmd = par.split(None,1)
         except:
-            print OInspect.getdoc(self.magic_alias)
+            print oinspect.getdoc(self.magic_alias)
         else:
             nargs = cmd.count('%s')
             if nargs>0 and cmd.find('%l')>=0:
diff --git a/IPython/OInspect.py b/IPython/core/oinspect.py
similarity index 100%
rename from IPython/OInspect.py
rename to IPython/core/oinspect.py
diff --git a/IPython/core/tests/test_imports.py b/IPython/core/tests/test_imports.py
index ec663b6..4a25569 100644
--- a/IPython/core/tests/test_imports.py
+++ b/IPython/core/tests/test_imports.py
@@ -40,3 +40,7 @@ def test_import_macro():
 def test_import_magic():
     from IPython.core import magic
 
+def test_import_oinspect():
+    from IPython.core import oinspect
+
+
diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py
index 079a1a3..f703581 100644
--- a/IPython/testing/iptest.py
+++ b/IPython/testing/iptest.py
@@ -203,7 +203,7 @@ def make_runners():
        'DPyGetOpt.py', 'dtutils.py', 'excolors.py', 'fakemodule.py',
        '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',
+       'logger.py', 'macro.py', 'magic.py', 'oinspect.py',
        'OutputTrap.py', 'platutils.py', 'prefilter.py', 'Prompts.py',
        'PyColorize.py', 'Release.py', 'rlineimpl.py', 'shadowns.py',
        'shellglobals.py', 'strdispatch.py', 'twshell.py',