##// END OF EJS Templates
Fix a couple of warnings/errors in doc builds.
Matthias Bussonnier -
Show More
@@ -44,15 +44,14 b' class EmbeddedMagics(Magics):'
44 the interactive shell interfering again.
44 the interactive shell interfering again.
45
45
46
46
47 Kill Instance Option
47 Kill Instance Option:
48 --------------------
48
49
49 If for some reasons you need to kill the location where the instance
50 If for some reasons you need to kill the location where the instance is
50 is created and not called, for example if you create a single
51 created and not called, for example if you create a single instance in
51 instance in one place and debug in many locations, you can use the
52 one place and debug in many locations, you can use the ``--instance``
52 ``--instance`` option to kill this specific instance. Like for the
53 option to kill this specific instance. Like for the ``call location``
53 ``call location`` killing an "instance" should work even if it is
54 killing an "instance" should work even if it is recreated within a
54 recreated within a loop.
55 loop.
56
55
57 .. note::
56 .. note::
58
57
@@ -104,9 +104,7 b' class TerminalInteractiveShell(InteractiveShell):'
104 IPython own testing machinery, and emacs inferior-shell integration through elpy.
104 IPython own testing machinery, and emacs inferior-shell integration through elpy.
105
105
106 This mode default to `True` if the `IPY_TEST_SIMPLE_PROMPT`
106 This mode default to `True` if the `IPY_TEST_SIMPLE_PROMPT`
107 environment variable is set, or the current terminal is not a tty.
107 environment variable is set, or the current terminal is not a tty."""
108
109 """
110 ).tag(config=True)
108 ).tag(config=True)
111
109
112 @property
110 @property
@@ -392,7 +392,8 b' def tokenize(readline):'
392 must be a callable object which provides the same interface as the
392 must be a callable object which provides the same interface as the
393 readline() method of built-in file objects. Each call to the function
393 readline() method of built-in file objects. Each call to the function
394 should return one line of input as bytes. Alternately, readline
394 should return one line of input as bytes. Alternately, readline
395 can be a callable function terminating with StopIteration:
395 can be a callable function terminating with :class:`StopIteration`::
396
396 readline = open(myfile, 'rb').__next__ # Example of alternate readline
397 readline = open(myfile, 'rb').__next__ # Example of alternate readline
397
398
398 The generator produces 5-tuples with these members: the token type; the
399 The generator produces 5-tuples with these members: the token type; the
@@ -38,7 +38,7 b' def line_at_cursor(cell, cursor_pos=0):'
38 Returns
38 Returns
39 -------
39 -------
40
40
41 (line, offset): (text, integer)
41 (line, offset): (string, integer)
42 The line with the current cursor, and the character offset of the start of the line.
42 The line with the current cursor, and the character offset of the start of the line.
43 """
43 """
44 offset = 0
44 offset = 0
@@ -195,7 +195,7 b' With (X)EMacs >= 24, You can enable IPython in python-mode with:'
195 .. _TextMate: http://macromates.com/
195 .. _TextMate: http://macromates.com/
196 .. _vim: http://www.vim.org/
196 .. _vim: http://www.vim.org/
197
197
198 .. _custom_keyboard_shortcuts
198 .. _custom_keyboard_shortcuts:
199
199
200 Keyboard Shortcuts
200 Keyboard Shortcuts
201 ==================
201 ==================
@@ -52,6 +52,7 b' completer interface:'
52 .. image:: ../_images/jedi_type_inference_60.png
52 .. image:: ../_images/jedi_type_inference_60.png
53 :alt: Jedi showing ability to do type inference
53 :alt: Jedi showing ability to do type inference
54 :align: center
54 :align: center
55 :width: 400px
55 :target: ../_images/jedi_type_inference_60.png
56 :target: ../_images/jedi_type_inference_60.png
56
57
57 The appearance of the completer is controlled by the
58 The appearance of the completer is controlled by the
@@ -63,7 +64,7 b' The use of Jedi also full fill a number of request and fix a number of bugs'
63 like case insensitive completion, completion after division operator: See
64 like case insensitive completion, completion after division operator: See
64 :ghpull:`10182`.
65 :ghpull:`10182`.
65
66
66 Extra patches and updates will be needed to the :any:`ipykernel` package for
67 Extra patches and updates will be needed to the :mod:`ipykernel` package for
67 this feature to be available to other clients like jupyter Notebook, Lab,
68 this feature to be available to other clients like jupyter Notebook, Lab,
68 Nteract, Hydrogen...
69 Nteract, Hydrogen...
69
70
General Comments 0
You need to be logged in to leave comments. Login now