##// END OF EJS Templates
Fix %lsmagic
Fernando Perez -
Show More
@@ -2009,7 +2009,7 b' class InteractiveShell(SingletonConfigurable):'
2009 # FIXME: Move the color initialization to the DisplayHook, which
2009 # FIXME: Move the color initialization to the DisplayHook, which
2010 # should be split into a prompt manager and displayhook. We probably
2010 # should be split into a prompt manager and displayhook. We probably
2011 # even need a centralize colors management object.
2011 # even need a centralize colors management object.
2012 #self.magic('colors %s' % self.colors)
2012 self.magic('colors %s' % self.colors)
2013 # History was moved to a separate module
2013 # History was moved to a separate module
2014 from IPython.core import history
2014 from IPython.core import history
2015 history.init_ipython(self)
2015 history.init_ipython(self)
@@ -93,7 +93,7 b' class BasicMagics(Magics):'
93 'Available cell magics:',
93 'Available cell magics:',
94 cesc + (' '+cesc).join(magics['cell']),
94 cesc + (' '+cesc).join(magics['cell']),
95 '',
95 '',
96 mman.auto_status[mman.automagic]]
96 mman.auto_status()]
97 return '\n'.join(out)
97 return '\n'.join(out)
98
98
99 @line_magic
99 @line_magic
General Comments 0
You need to be logged in to leave comments. Login now