Show More
@@ -245,11 +245,10 class ShadowHist(object): | |||||
245 |
|
245 | |||
246 |
|
246 | |||
247 | def init_ipython(ip): |
|
247 | def init_ipython(ip): | |
248 | # XXX - ipy_completers are in quarantine, need to be updated to new apis |
|
|||
249 | #import ipy_completers |
|
|||
250 |
|
||||
251 | ip.define_magic("rep",rep_f) |
|
248 | ip.define_magic("rep",rep_f) | |
252 | ip.define_magic("hist",magic_hist) |
|
249 | ip.define_magic("hist",magic_hist) | |
253 | ip.define_magic("history",magic_history) |
|
250 | ip.define_magic("history",magic_history) | |
254 |
|
251 | |||
|
252 | # XXX - ipy_completers are in quarantine, need to be updated to new apis | |||
|
253 | #import ipy_completers | |||
255 | #ipy_completers.quick_completer('%hist' ,'-g -t -r -n') |
|
254 | #ipy_completers.quick_completer('%hist' ,'-g -t -r -n') |
@@ -17,6 +17,7 Main IPython Component | |||||
17 | #----------------------------------------------------------------------------- |
|
17 | #----------------------------------------------------------------------------- | |
18 |
|
18 | |||
19 | from __future__ import with_statement |
|
19 | from __future__ import with_statement | |
|
20 | from __future__ import absolute_import | |||
20 |
|
21 | |||
21 | import __builtin__ |
|
22 | import __builtin__ | |
22 | import StringIO |
|
23 | import StringIO | |
@@ -1582,6 +1583,9 class InteractiveShell(Component, Magic): | |||||
1582 | # Set user colors (don't do it in the constructor above so that it |
|
1583 | # Set user colors (don't do it in the constructor above so that it | |
1583 | # doesn't crash if colors option is invalid) |
|
1584 | # doesn't crash if colors option is invalid) | |
1584 | self.magic_colors(self.colors) |
|
1585 | self.magic_colors(self.colors) | |
|
1586 | # History was moved to a separate module | |||
|
1587 | from . import history | |||
|
1588 | history.init_ipython(self) | |||
1585 |
|
1589 | |||
1586 | def magic(self,arg_s): |
|
1590 | def magic(self,arg_s): | |
1587 | """Call a magic function by name. |
|
1591 | """Call a magic function by name. |
General Comments 0
You need to be logged in to leave comments.
Login now