Show More
@@ -36,7 +36,7 b' except ImportError:' | |||||
36 | import IPython |
|
36 | import IPython | |
37 | from IPython import ultraTB |
|
37 | from IPython import ultraTB | |
38 | from IPython.core import ipapi |
|
38 | from IPython.core import ipapi | |
39 |
from IPython. |
|
39 | from IPython.core.magic import Magic | |
40 | from IPython.utils.genutils import Term,warn,error,flag_calls, ask_yes_no |
|
40 | from IPython.utils.genutils import Term,warn,error,flag_calls, ask_yes_no | |
41 | from IPython.core.iplib import InteractiveShell |
|
41 | from IPython.core.iplib import InteractiveShell | |
42 | from IPython.core.ipmaker import make_IPython |
|
42 | from IPython.core.ipmaker import make_IPython |
@@ -51,7 +51,7 b' from IPython.Extensions import pickleshare' | |||||
51 | from IPython.core.fakemodule import FakeModule, init_fakemod_dict |
|
51 | from IPython.core.fakemodule import FakeModule, init_fakemod_dict | |
52 | from IPython.external.Itpl import ItplNS |
|
52 | from IPython.external.Itpl import ItplNS | |
53 | from IPython.core.logger import Logger |
|
53 | from IPython.core.logger import Logger | |
54 |
from IPython. |
|
54 | from IPython.core.magic import Magic | |
55 | from IPython.Prompts import CachedOutput |
|
55 | from IPython.Prompts import CachedOutput | |
56 | from IPython.utils.ipstruct import Struct |
|
56 | from IPython.utils.ipstruct import Struct | |
57 | from IPython.lib.backgroundjobs import BackgroundJobManager |
|
57 | from IPython.lib.backgroundjobs import BackgroundJobManager |
1 | NO CONTENT: file renamed from IPython/Magic.py to IPython/core/magic.py |
|
NO CONTENT: file renamed from IPython/Magic.py to IPython/core/magic.py |
@@ -37,4 +37,6 b' def test_import_logger():' | |||||
37 | def test_import_macro(): |
|
37 | def test_import_macro(): | |
38 | from IPython.core import macro |
|
38 | from IPython.core import macro | |
39 |
|
39 | |||
|
40 | def test_import_magic(): | |||
|
41 | from IPython.core import magic | |||
40 |
|
42 |
@@ -203,7 +203,7 b' def make_runners():' | |||||
203 | 'DPyGetOpt.py', 'dtutils.py', 'excolors.py', 'fakemodule.py', |
|
203 | 'DPyGetOpt.py', 'dtutils.py', 'excolors.py', 'fakemodule.py', | |
204 | 'generics.py', 'genutils.py', 'history.py', 'hooks.py', 'ipapi.py', |
|
204 | 'generics.py', 'genutils.py', 'history.py', 'hooks.py', 'ipapi.py', | |
205 | 'iplib.py', 'ipmaker.py', 'ipstruct.py', 'Itpl.py', |
|
205 | 'iplib.py', 'ipmaker.py', 'ipstruct.py', 'Itpl.py', | |
206 |
'logger.py', 'macro.py', ' |
|
206 | 'logger.py', 'macro.py', 'magic.py', 'OInspect.py', | |
207 | 'OutputTrap.py', 'platutils.py', 'prefilter.py', 'Prompts.py', |
|
207 | 'OutputTrap.py', 'platutils.py', 'prefilter.py', 'Prompts.py', | |
208 | 'PyColorize.py', 'Release.py', 'rlineimpl.py', 'shadowns.py', |
|
208 | 'PyColorize.py', 'Release.py', 'rlineimpl.py', 'shadowns.py', | |
209 | 'shellglobals.py', 'strdispatch.py', 'twshell.py', |
|
209 | 'shellglobals.py', 'strdispatch.py', 'twshell.py', |
@@ -34,7 +34,7 b' deco:' | |||||
34 | $(NOSE0) IPython.testing.decorators |
|
34 | $(NOSE0) IPython.testing.decorators | |
35 |
|
35 | |||
36 | magic: plugin |
|
36 | magic: plugin | |
37 |
$(NOSE) IPython. |
|
37 | $(NOSE) IPython.core.magic | |
38 |
|
38 | |||
39 | excolors: plugin |
|
39 | excolors: plugin | |
40 | $(NOSE) IPython.core.excolors |
|
40 | $(NOSE) IPython.core.excolors |
General Comments 0
You need to be logged in to leave comments.
Login now