Show More
@@ -10,11 +10,15 b' from __future__ import print_function' | |||||
10 |
|
10 | |||
11 | import sys |
|
11 | import sys | |
12 | import warnings |
|
12 | import warnings | |
|
13 | from IPython.utils.decorators import undoc | |||
13 |
|
14 | |||
14 | warnings.warn("The module IPython.utils.warn is deprecated since IPython 4.0, use the standard warnings module instead", DeprecationWarning) |
|
15 | warnings.warn("The module IPython.utils.warn is deprecated since IPython 4.0, use the standard warnings module instead", DeprecationWarning) | |
15 |
|
16 | |||
|
17 | @undoc | |||
16 | def warn(msg,level=2,exit_val=1): |
|
18 | def warn(msg,level=2,exit_val=1): | |
17 | """Standard warning printer. Gives formatting consistency. |
|
19 | """Deprecated | |
|
20 | ||||
|
21 | Standard warning printer. Gives formatting consistency. | |||
18 |
|
22 | |||
19 | Output is sent to io.stderr (sys.stderr by default). |
|
23 | Output is sent to io.stderr (sys.stderr by default). | |
20 |
|
24 | |||
@@ -39,19 +43,28 b' def warn(msg,level=2,exit_val=1):' | |||||
39 | sys.exit(exit_val) |
|
43 | sys.exit(exit_val) | |
40 |
|
44 | |||
41 |
|
45 | |||
|
46 | @undoc | |||
42 | def info(msg): |
|
47 | def info(msg): | |
43 | """Equivalent to warn(msg,level=1).""" |
|
48 | """Deprecated | |
|
49 | ||||
|
50 | Equivalent to warn(msg,level=1).""" | |||
44 |
|
51 | |||
45 | warn(msg,level=1) |
|
52 | warn(msg,level=1) | |
46 |
|
53 | |||
47 |
|
54 | |||
|
55 | @undoc | |||
48 | def error(msg): |
|
56 | def error(msg): | |
49 | """Equivalent to warn(msg,level=3).""" |
|
57 | """Deprecated | |
|
58 | ||||
|
59 | Equivalent to warn(msg,level=3).""" | |||
50 |
|
60 | |||
51 | warn(msg,level=3) |
|
61 | warn(msg,level=3) | |
52 |
|
62 | |||
53 |
|
63 | |||
|
64 | @undoc | |||
54 | def fatal(msg,exit_val=1): |
|
65 | def fatal(msg,exit_val=1): | |
55 | """Equivalent to warn(msg,exit_val=exit_val,level=4).""" |
|
66 | """Deprecated | |
|
67 | ||||
|
68 | Equivalent to warn(msg,exit_val=exit_val,level=4).""" | |||
56 |
|
69 | |||
57 | warn(msg,exit_val=exit_val,level=4) |
|
70 | warn(msg,exit_val=exit_val,level=4) |
@@ -87,7 +87,7 b' source/api/generated/gen.txt:' | |||||
87 | $(PYTHON) autogen_api.py |
|
87 | $(PYTHON) autogen_api.py | |
88 | @echo "Build API docs finished." |
|
88 | @echo "Build API docs finished." | |
89 |
|
89 | |||
90 | autogen_shortcuts: autogen_shortcuts.py ../IPython/terminal/interactiveshell.py |
|
90 | autogen_shortcuts: autogen_shortcuts.py ../IPython/terminal/interactiveshell.py source/config/shortcuts/index.rst | |
91 | $(PYTHON) autogen_shortcuts.py |
|
91 | $(PYTHON) autogen_shortcuts.py | |
92 | @echo "Created docs for shortcuts" |
|
92 | @echo "Created docs for shortcuts" | |
93 |
|
93 |
@@ -4,7 +4,7 b' IPython shortcuts' | |||||
4 |
|
4 | |||
5 | Available shortcut in IPython terminal. |
|
5 | Available shortcut in IPython terminal. | |
6 |
|
6 | |||
7 |
.. warning |
|
7 | .. warning:: | |
8 |
|
8 | |||
9 | This list is automatically generated, and may not hold all the available |
|
9 | This list is automatically generated, and may not hold all the available | |
10 | shortcut. In particular, it may depends on the version of ``prompt_toolkit`` |
|
10 | shortcut. In particular, it may depends on the version of ``prompt_toolkit`` |
General Comments 0
You need to be logged in to leave comments.
Login now