Magic.py => core/magic.py and imports updated.

IPython/Shell.py

@@ -36,7 +36,7 b' except ImportError:'
 import IPython
 from IPython import ultraTB
 from IPython.core import ipapi
-from IPython.Magic import Magic
+from IPython.core.magic import Magic
 from IPython.utils.genutils import Term,warn,error,flag_calls, ask_yes_no
 from IPython.core.iplib import InteractiveShell
 from IPython.core.ipmaker import make_IPython

IPython/core/iplib.py

@@ -51,7 +51,7 b' from IPython.Extensions import pickleshare'
 from IPython.core.fakemodule import FakeModule, init_fakemod_dict
 from IPython.external.Itpl import ItplNS
 from IPython.core.logger import Logger
-from IPython.Magic import Magic
+from IPython.core.magic import Magic
 from IPython.Prompts import CachedOutput
 from IPython.utils.ipstruct import Struct
 from IPython.lib.backgroundjobs import BackgroundJobManager

IPython/core/tests/test_imports.py

@@ -37,4 +37,6 b' def test_import_logger():'
 def test_import_macro():
     from IPython.core import macro
 
+def test_import_magic():
+    from IPython.core import magic
 

IPython/testing/iptest.py

@@ -203,7 +203,7 b' 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',

IPython/testing/plugin/Makefile

@@ -34,7 +34,7 b' deco:'
 	$(NOSE0) IPython.testing.decorators
 
 magic: plugin
-	$(NOSE) IPython.Magic
+	$(NOSE) IPython.core.magic
 
 excolors: plugin
 	$(NOSE) IPython.core.excolors