Show More
@@ -1042,12 +1042,12 b' class InteractiveShell(Configurable, Magic):' | |||||
1042 | # Namespaces to search in: |
|
1042 | # Namespaces to search in: | |
1043 | # Put them in a list. The order is important so that we |
|
1043 | # Put them in a list. The order is important so that we | |
1044 | # find things in the same order that Python finds them. |
|
1044 | # find things in the same order that Python finds them. | |
1045 |
namespaces = [ ('Interactive', self. |
|
1045 | namespaces = [ ('Interactive', self.user_ns), | |
1046 |
('IPython internal', self. |
|
1046 | ('IPython internal', self.internal_ns), | |
1047 | ('Python builtin', __builtin__.__dict__), |
|
1047 | ('Python builtin', __builtin__.__dict__), | |
1048 |
('Alias', self. |
|
1048 | ('Alias', self.alias_manager.alias_table), | |
1049 | ] |
|
1049 | ] | |
1050 |
alias_ns = self. |
|
1050 | alias_ns = self.alias_manager.alias_table | |
1051 |
|
1051 | |||
1052 | # initialize results to 'null' |
|
1052 | # initialize results to 'null' | |
1053 | found = False; obj = None; ospace = None; ds = None; |
|
1053 | found = False; obj = None; ospace = None; ds = None; | |
@@ -1056,7 +1056,7 b' class InteractiveShell(Configurable, Magic):' | |||||
1056 | # We need to special-case 'print', which as of python2.6 registers as a |
|
1056 | # We need to special-case 'print', which as of python2.6 registers as a | |
1057 | # function but should only be treated as one if print_function was |
|
1057 | # function but should only be treated as one if print_function was | |
1058 | # loaded with a future import. In this case, just bail. |
|
1058 | # loaded with a future import. In this case, just bail. | |
1059 |
if (oname == 'print' and not (self. |
|
1059 | if (oname == 'print' and not (self.compile.compiler.flags & | |
1060 | __future__.CO_FUTURE_PRINT_FUNCTION)): |
|
1060 | __future__.CO_FUTURE_PRINT_FUNCTION)): | |
1061 | return {'found':found, 'obj':obj, 'namespace':ospace, |
|
1061 | return {'found':found, 'obj':obj, 'namespace':ospace, | |
1062 | 'ismagic':ismagic, 'isalias':isalias, 'parent':parent} |
|
1062 | 'ismagic':ismagic, 'isalias':isalias, 'parent':parent} | |
@@ -1147,7 +1147,7 b' class InteractiveShell(Configurable, Magic):' | |||||
1147 | except AttributeError: pass |
|
1147 | except AttributeError: pass | |
1148 | except AttributeError: pass |
|
1148 | except AttributeError: pass | |
1149 |
|
1149 | |||
1150 |
pmethod = getattr(self. |
|
1150 | pmethod = getattr(self.inspector,meth) | |
1151 | formatter = info.ismagic and self.format_screen or None |
|
1151 | formatter = info.ismagic and self.format_screen or None | |
1152 | if meth == 'pdoc': |
|
1152 | if meth == 'pdoc': | |
1153 | pmethod(info.obj,oname,formatter) |
|
1153 | pmethod(info.obj,oname,formatter) |
General Comments 0
You need to be logged in to leave comments.
Login now