Show More
@@ -1993,7 +1993,6 b' class InteractiveShell(SingletonConfigurable):' | |||||
1993 | #------------------------------------------------------------------------- |
|
1993 | #------------------------------------------------------------------------- | |
1994 |
|
1994 | |||
1995 | def init_magics(self): |
|
1995 | def init_magics(self): | |
1996 | from IPython.core import magic_functions as mf |
|
|||
1997 | from IPython.core import magics as m |
|
1996 | from IPython.core import magics as m | |
1998 | self.magics_manager = magic.MagicsManager(shell=self, |
|
1997 | self.magics_manager = magic.MagicsManager(shell=self, | |
1999 | confg=self.config, |
|
1998 | confg=self.config, | |
@@ -2006,7 +2005,7 b' class InteractiveShell(SingletonConfigurable):' | |||||
2006 | self.define_magic = self.magics_manager.define_magic |
|
2005 | self.define_magic = self.magics_manager.define_magic | |
2007 |
|
2006 | |||
2008 | self.register_magics(m.AutoMagics, m.BasicMagics, m.CodeMagics, |
|
2007 | self.register_magics(m.AutoMagics, m.BasicMagics, m.CodeMagics, | |
2009 |
m.ConfigMagics, m |
|
2008 | m.ConfigMagics, m.DeprecatedMagics, m.ExecutionMagics, | |
2010 | m.ExtensionMagics, m.HistoryMagics, m.LoggingMagics, |
|
2009 | m.ExtensionMagics, m.HistoryMagics, m.LoggingMagics, | |
2011 | m.NamespaceMagics, m.OSMagics, m.PylabMagics ) |
|
2010 | m.NamespaceMagics, m.OSMagics, m.PylabMagics ) | |
2012 |
|
2011 |
@@ -17,6 +17,7 b' from .auto import AutoMagics' | |||||
17 | from .basic import BasicMagics |
|
17 | from .basic import BasicMagics | |
18 | from .code import CodeMagics, MacroToEdit |
|
18 | from .code import CodeMagics, MacroToEdit | |
19 | from .config import ConfigMagics |
|
19 | from .config import ConfigMagics | |
|
20 | from .deprecated import DeprecatedMagics | |||
20 | from .execution import ExecutionMagics |
|
21 | from .execution import ExecutionMagics | |
21 | from .extension import ExtensionMagics |
|
22 | from .extension import ExtensionMagics | |
22 | from .history import HistoryMagics |
|
23 | from .history import HistoryMagics |
@@ -1,13 +1,11 b'' | |||||
1 | """Magic functions for InteractiveShell. |
|
1 | """Deprecated Magic functions. | |
2 | """ |
|
2 | """ | |
3 |
|
||||
4 | #----------------------------------------------------------------------------- |
|
3 | #----------------------------------------------------------------------------- | |
5 | # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and |
|
4 | # Copyright (c) 2012 The IPython Development Team. | |
6 | # Copyright (C) 2001 Fernando Perez <fperez@colorado.edu> |
|
5 | # | |
7 | # Copyright (C) 2008 The IPython Development Team |
|
6 | # Distributed under the terms of the Modified BSD License. | |
8 |
|
7 | # | ||
9 | # Distributed under the terms of the BSD License. The full license is in |
|
8 | # The full license is in the file COPYING.txt, distributed with this software. | |
10 | # the file COPYING, distributed as part of this software. |
|
|||
11 | #----------------------------------------------------------------------------- |
|
9 | #----------------------------------------------------------------------------- | |
12 |
|
10 | |||
13 | #----------------------------------------------------------------------------- |
|
11 | #----------------------------------------------------------------------------- | |
@@ -21,7 +19,6 b' from IPython.core.magic import Magics, register_magics, line_magic' | |||||
21 | # Magic implementation classes |
|
19 | # Magic implementation classes | |
22 | #----------------------------------------------------------------------------- |
|
20 | #----------------------------------------------------------------------------- | |
23 |
|
21 | |||
24 |
|
||||
25 | @register_magics |
|
22 | @register_magics | |
26 | class DeprecatedMagics(Magics): |
|
23 | class DeprecatedMagics(Magics): | |
27 | """Magics slated for later removal.""" |
|
24 | """Magics slated for later removal.""" |
General Comments 0
You need to be logged in to leave comments.
Login now