##// END OF EJS Templates
more fixes
M Bussonnier -
Show More
@@ -1,5 +1,6
1 """Implementation of all the magic functions built into IPython.
1 """Implementation of all the magic functions built into IPython.
2 """
2 """
3
3 #-----------------------------------------------------------------------------
4 # -----------------------------------------------------------------------------
4 # Copyright (c) 2012 The IPython Development Team.
5 # Copyright (c) 2012 The IPython Development Team.
5 #
6 #
@@ -12,26 +13,28
12 # Imports
13 # Imports
13 #-----------------------------------------------------------------------------
14 # -----------------------------------------------------------------------------
14
15
15 from ..magic import Magics, magics_class
16 from ..magic import Magics as Magics, magics_class as magics_class
16 from .auto import AutoMagics
17 from .auto import AutoMagics as AutoMagics
17 from .basic import BasicMagics, AsyncMagics
18 from .basic import BasicMagics as BasicMagics, AsyncMagics as AsyncMagics
18 from .code import CodeMagics, MacroToEdit
19 from .code import CodeMagics as CodeMagics, MacroToEdit as MacroToEdit
19 from .config import ConfigMagics
20 from .config import ConfigMagics as ConfigMagics
20 from .display import DisplayMagics
21 from .display import DisplayMagics as DisplayMagics
21 from .execution import ExecutionMagics
22 from .execution import ExecutionMagics as ExecutionMagics
22 from .extension import ExtensionMagics
23 from .extension import ExtensionMagics as ExtensionMagics
23 from .history import HistoryMagics
24 from .history import HistoryMagics as HistoryMagics
24 from .logging import LoggingMagics
25 from .logging import LoggingMagics as LoggingMagics
25 from .namespace import NamespaceMagics
26 from .namespace import NamespaceMagics as NamespaceMagics
26 from .osm import OSMagics
27 from .osm import OSMagics as OSMagics
27 from .packaging import PackagingMagics
28 from .packaging import PackagingMagics as PackagingMagics
28 from .pylab import PylabMagics
29 from .pylab import PylabMagics as PylabMagics
29 from .script import ScriptMagics
30 from .script import ScriptMagics as ScriptMagics
31
30
32
31 #-----------------------------------------------------------------------------
33 # -----------------------------------------------------------------------------
32 # Magic implementation classes
34 # Magic implementation classes
33 #-----------------------------------------------------------------------------
35 # -----------------------------------------------------------------------------
34
36
37
35 @magics_class
38 @magics_class
36 class UserMagics(Magics):
39 class UserMagics(Magics):
37 """Placeholder for user-defined magics to be added at runtime.
40 """Placeholder for user-defined magics to be added at runtime.
@@ -21,25 +21,16 import time
21 import timeit
21 import timeit
22 from typing import Dict, Any
22 from typing import Dict, Any
23 from ast import (
23 from ast import (
24 Assign,
25 Call,
26 Expr,
27 Load,
28 Module,
24 Module,
29 Name,
30 NodeTransformer,
31 Store,
32 parse,
33 unparse,
34 )
25 )
35 from io import StringIO
26 from io import StringIO
36 from logging import error
27 from logging import error
37 from pathlib import Path
28 from pathlib import Path
38 from pdb import Restart
29 from pdb import Restart
39 from textwrap import dedent, indent
30 from textwrap import indent
40 from warnings import warn
31 from warnings import warn
41
32
42 from IPython.core import magic_arguments, oinspect, page
33 from IPython.core import magic_arguments, page
43 from IPython.core.displayhook import DisplayHook
34 from IPython.core.displayhook import DisplayHook
44 from IPython.core.error import UsageError
35 from IPython.core.error import UsageError
45 from IPython.core.macro import Macro
36 from IPython.core.macro import Macro
General Comments 0
You need to be logged in to leave comments. Login now