FakeModule.py => core/fakemodule.py and updated tests and imports.

IPython/Extensions/ipy_jot.py

@@ -14,7 +14,7 b' ip = IPython.ipapi.get()'
 import pickleshare
 
 import inspect,pickle,os,sys,textwrap
-from IPython.FakeModule import FakeModule
+from IPython.core.fakemodule import FakeModule
 from IPython.ipstruct import Struct 
 
 

IPython/Extensions/pspersistence.py

@@ -12,7 +12,7 b' ip = IPython.ipapi.get()'
 import pickleshare
 
 import inspect,pickle,os,sys,textwrap
-from IPython.FakeModule import FakeModule
+from IPython.core.fakemodule import FakeModule
 
 def restore_aliases(self):
     ip = self.getapi()

IPython/Magic.py

@@ -45,7 +45,7 b' except ImportError:'
 import IPython
 from IPython import OInspect, wildcard
 from IPython.core import debugger
-from IPython.FakeModule import FakeModule
+from IPython.core.fakemodule import FakeModule
 from IPython.Itpl import Itpl, itpl, printpl,itplns
 from IPython.PyColorize import Parser
 from IPython.ipstruct import Struct

IPython/core/tests/test_fakemodule.py

@@ -3,7 +3,7 b''
 
 import nose.tools as nt
 
-from IPython.FakeModule import FakeModule, init_fakemod_dict
+from IPython.core.fakemodule import FakeModule, init_fakemod_dict
 
 # Make a fakemod and check a few properties
 def test_mk_fakemod():

IPython/core/tests/test_imports.py

@@ -9,3 +9,7 b' def test_import_crashhandler():'
 
 def test_import_debugger():
     from IPython.core import debugger
+
+def test_import_fakemodule():
+    from IPython.core import fakemodule
+

IPython/iplib.py

@@ -48,7 +48,7 b' import tempfile'
 from IPython import OInspect,PyColorize,ultraTB
 from IPython.core import debugger
 from IPython.Extensions import pickleshare
-from IPython.FakeModule import FakeModule, init_fakemod_dict
+from IPython.core.fakemodule import FakeModule, init_fakemod_dict
 from IPython.Itpl import ItplNS
 from IPython.Logger import Logger
 from IPython.Magic import Magic

IPython/testing/iptest.py

@@ -200,7 +200,7 b' def make_runners():'
     top_mod = \
       ['backgroundjobs.py', 'coloransi.py', 'completer.py', 'configloader.py',
        'crashhandler.py', 'debugger.py', 'deepreload.py', 'demo.py',
-       'DPyGetOpt.py', 'dtutils.py', 'excolors.py', 'FakeModule.py',
+       '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',

docs/source/development/reorg.txt

@@ -105,15 +105,14 b' Where things will be moved'
 
 * :file:`DPyGetOpt.py`.  Move to :mod:`IPython.utils` and replace with newer options parser.
 
-* :file:`dtutils.py`.  Remove or move to :file:`IPython.testing` or
-  :file:`IPython.lib`.
+* :file:`dtutils.py`.  Move to :file:`IPython.deathrow`.
 
+* :file:`FakeModule.py`.  Move to :file:`IPython/core/fakemodule.py`.
 
 
 * :file:`Extensions`. This needs to be gone through separately.  Minimally,
   the package should be renamed to :file:`extensions`.
 
-* :file:`FakeModule.py`.  Move to :file:`IPython/core/fakemodule.py`.
 
 * :file:`Gnuplot2.py`.  Move to :file:`IPython.sandbox`.