Show More
@@ -45,8 +45,8 b' import tempfile' | |||||
45 |
|
45 | |||
46 | # IPython's own modules |
|
46 | # IPython's own modules | |
47 | #import IPython |
|
47 | #import IPython | |
48 |
from IPython import |
|
48 | from IPython import PyColorize,ultraTB | |
49 | from IPython.core import debugger |
|
49 | from IPython.core import debugger, oinspect | |
50 | from IPython.Extensions import pickleshare |
|
50 | 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 | |
@@ -844,7 +844,7 b' class InteractiveShell(object,Magic):' | |||||
844 | rc = self.rc |
|
844 | rc = self.rc | |
845 |
|
845 | |||
846 | # Object inspector |
|
846 | # Object inspector | |
847 |
self.inspector = |
|
847 | self.inspector = oinspect.Inspector(oinspect.InspectColors, | |
848 | PyColorize.ANSICodeColors, |
|
848 | PyColorize.ANSICodeColors, | |
849 | 'NoColor', |
|
849 | 'NoColor', | |
850 | rc.object_info_string_level) |
|
850 | rc.object_info_string_level) |
@@ -43,8 +43,8 b' except ImportError:' | |||||
43 |
|
43 | |||
44 | # Homebrewed |
|
44 | # Homebrewed | |
45 | import IPython |
|
45 | import IPython | |
46 |
from IPython import |
|
46 | from IPython import wildcard | |
47 | from IPython.core import debugger |
|
47 | from IPython.core import debugger, oinspect | |
48 | from IPython.core.fakemodule import FakeModule |
|
48 | from IPython.core.fakemodule import FakeModule | |
49 | from IPython.external.Itpl import Itpl, itpl, printpl,itplns |
|
49 | from IPython.external.Itpl import Itpl, itpl, printpl,itplns | |
50 | from IPython.PyColorize import Parser |
|
50 | from IPython.PyColorize import Parser | |
@@ -1562,7 +1562,7 b' Currently the magic system has the following functions:\\n"""' | |||||
1562 | filename = file_finder(arg_lst[0]) |
|
1562 | filename = file_finder(arg_lst[0]) | |
1563 | except IndexError: |
|
1563 | except IndexError: | |
1564 | warn('you must provide at least a filename.') |
|
1564 | warn('you must provide at least a filename.') | |
1565 |
print '\n%run:\n', |
|
1565 | print '\n%run:\n',oinspect.getdoc(self.magic_run) | |
1566 | return |
|
1566 | return | |
1567 | except IOError,msg: |
|
1567 | except IOError,msg: | |
1568 | error(msg) |
|
1568 | error(msg) | |
@@ -2641,7 +2641,7 b' Defaulting color scheme to \'NoColor\'"""' | |||||
2641 | try: |
|
2641 | try: | |
2642 | alias,cmd = par.split(None,1) |
|
2642 | alias,cmd = par.split(None,1) | |
2643 | except: |
|
2643 | except: | |
2644 |
print |
|
2644 | print oinspect.getdoc(self.magic_alias) | |
2645 | else: |
|
2645 | else: | |
2646 | nargs = cmd.count('%s') |
|
2646 | nargs = cmd.count('%s') | |
2647 | if nargs>0 and cmd.find('%l')>=0: |
|
2647 | if nargs>0 and cmd.find('%l')>=0: |
1 | NO CONTENT: file renamed from IPython/OInspect.py to IPython/core/oinspect.py |
|
NO CONTENT: file renamed from IPython/OInspect.py to IPython/core/oinspect.py |
@@ -40,3 +40,7 b' def test_import_macro():' | |||||
40 | def test_import_magic(): |
|
40 | def test_import_magic(): | |
41 | from IPython.core import magic |
|
41 | from IPython.core import magic | |
42 |
|
42 | |||
|
43 | def test_import_oinspect(): | |||
|
44 | from IPython.core import oinspect | |||
|
45 | ||||
|
46 |
@@ -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', 'magic.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', |
General Comments 0
You need to be logged in to leave comments.
Login now