##// END OF EJS Templates
Update what's new and limit number of subclasses....
Matthias Bussonnier -
Show More
@@ -1,1059 +1,1062 b''
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2 """Tools for inspecting Python objects.
2 """Tools for inspecting Python objects.
3
3
4 Uses syntax highlighting for presenting the various information elements.
4 Uses syntax highlighting for presenting the various information elements.
5
5
6 Similar in spirit to the inspect module, but all calls take a name argument to
6 Similar in spirit to the inspect module, but all calls take a name argument to
7 reference the name under which an object is being read.
7 reference the name under which an object is being read.
8 """
8 """
9
9
10 # Copyright (c) IPython Development Team.
10 # Copyright (c) IPython Development Team.
11 # Distributed under the terms of the Modified BSD License.
11 # Distributed under the terms of the Modified BSD License.
12
12
13 __all__ = ['Inspector','InspectColors']
13 __all__ = ['Inspector','InspectColors']
14
14
15 # stdlib modules
15 # stdlib modules
16 import ast
16 import ast
17 import inspect
17 import inspect
18 from inspect import signature
18 from inspect import signature
19 import linecache
19 import linecache
20 import warnings
20 import warnings
21 import os
21 import os
22 from textwrap import dedent
22 from textwrap import dedent
23 import types
23 import types
24 import io as stdlib_io
24 import io as stdlib_io
25 from itertools import zip_longest
25 from itertools import zip_longest
26
26
27 # IPython's own
27 # IPython's own
28 from IPython.core import page
28 from IPython.core import page
29 from IPython.lib.pretty import pretty
29 from IPython.lib.pretty import pretty
30 from IPython.testing.skipdoctest import skip_doctest
30 from IPython.testing.skipdoctest import skip_doctest
31 from IPython.utils import PyColorize
31 from IPython.utils import PyColorize
32 from IPython.utils import openpy
32 from IPython.utils import openpy
33 from IPython.utils import py3compat
33 from IPython.utils import py3compat
34 from IPython.utils.dir2 import safe_hasattr
34 from IPython.utils.dir2 import safe_hasattr
35 from IPython.utils.path import compress_user
35 from IPython.utils.path import compress_user
36 from IPython.utils.text import indent
36 from IPython.utils.text import indent
37 from IPython.utils.wildcard import list_namespace
37 from IPython.utils.wildcard import list_namespace
38 from IPython.utils.coloransi import TermColors, ColorScheme, ColorSchemeTable
38 from IPython.utils.coloransi import TermColors, ColorScheme, ColorSchemeTable
39 from IPython.utils.py3compat import cast_unicode
39 from IPython.utils.py3compat import cast_unicode
40 from IPython.utils.colorable import Colorable
40 from IPython.utils.colorable import Colorable
41 from IPython.utils.decorators import undoc
41 from IPython.utils.decorators import undoc
42
42
43 from pygments import highlight
43 from pygments import highlight
44 from pygments.lexers import PythonLexer
44 from pygments.lexers import PythonLexer
45 from pygments.formatters import HtmlFormatter
45 from pygments.formatters import HtmlFormatter
46
46
47 def pylight(code):
47 def pylight(code):
48 return highlight(code, PythonLexer(), HtmlFormatter(noclasses=True))
48 return highlight(code, PythonLexer(), HtmlFormatter(noclasses=True))
49
49
50 # builtin docstrings to ignore
50 # builtin docstrings to ignore
51 _func_call_docstring = types.FunctionType.__call__.__doc__
51 _func_call_docstring = types.FunctionType.__call__.__doc__
52 _object_init_docstring = object.__init__.__doc__
52 _object_init_docstring = object.__init__.__doc__
53 _builtin_type_docstrings = {
53 _builtin_type_docstrings = {
54 inspect.getdoc(t) for t in (types.ModuleType, types.MethodType,
54 inspect.getdoc(t) for t in (types.ModuleType, types.MethodType,
55 types.FunctionType, property)
55 types.FunctionType, property)
56 }
56 }
57
57
58 _builtin_func_type = type(all)
58 _builtin_func_type = type(all)
59 _builtin_meth_type = type(str.upper) # Bound methods have the same type as builtin functions
59 _builtin_meth_type = type(str.upper) # Bound methods have the same type as builtin functions
60 #****************************************************************************
60 #****************************************************************************
61 # Builtin color schemes
61 # Builtin color schemes
62
62
63 Colors = TermColors # just a shorthand
63 Colors = TermColors # just a shorthand
64
64
65 InspectColors = PyColorize.ANSICodeColors
65 InspectColors = PyColorize.ANSICodeColors
66
66
67 #****************************************************************************
67 #****************************************************************************
68 # Auxiliary functions and objects
68 # Auxiliary functions and objects
69
69
70 # See the messaging spec for the definition of all these fields. This list
70 # See the messaging spec for the definition of all these fields. This list
71 # effectively defines the order of display
71 # effectively defines the order of display
72 info_fields = ['type_name', 'base_class', 'string_form', 'namespace',
72 info_fields = ['type_name', 'base_class', 'string_form', 'namespace',
73 'length', 'file', 'definition', 'docstring', 'source',
73 'length', 'file', 'definition', 'docstring', 'source',
74 'init_definition', 'class_docstring', 'init_docstring',
74 'init_definition', 'class_docstring', 'init_docstring',
75 'call_def', 'call_docstring',
75 'call_def', 'call_docstring',
76 # These won't be printed but will be used to determine how to
76 # These won't be printed but will be used to determine how to
77 # format the object
77 # format the object
78 'ismagic', 'isalias', 'isclass', 'argspec', 'found', 'name'
78 'ismagic', 'isalias', 'isclass', 'argspec', 'found', 'name'
79 ]
79 ]
80
80
81
81
82 def object_info(**kw):
82 def object_info(**kw):
83 """Make an object info dict with all fields present."""
83 """Make an object info dict with all fields present."""
84 infodict = dict(zip_longest(info_fields, [None]))
84 infodict = dict(zip_longest(info_fields, [None]))
85 infodict.update(kw)
85 infodict.update(kw)
86 return infodict
86 return infodict
87
87
88
88
89 def get_encoding(obj):
89 def get_encoding(obj):
90 """Get encoding for python source file defining obj
90 """Get encoding for python source file defining obj
91
91
92 Returns None if obj is not defined in a sourcefile.
92 Returns None if obj is not defined in a sourcefile.
93 """
93 """
94 ofile = find_file(obj)
94 ofile = find_file(obj)
95 # run contents of file through pager starting at line where the object
95 # run contents of file through pager starting at line where the object
96 # is defined, as long as the file isn't binary and is actually on the
96 # is defined, as long as the file isn't binary and is actually on the
97 # filesystem.
97 # filesystem.
98 if ofile is None:
98 if ofile is None:
99 return None
99 return None
100 elif ofile.endswith(('.so', '.dll', '.pyd')):
100 elif ofile.endswith(('.so', '.dll', '.pyd')):
101 return None
101 return None
102 elif not os.path.isfile(ofile):
102 elif not os.path.isfile(ofile):
103 return None
103 return None
104 else:
104 else:
105 # Print only text files, not extension binaries. Note that
105 # Print only text files, not extension binaries. Note that
106 # getsourcelines returns lineno with 1-offset and page() uses
106 # getsourcelines returns lineno with 1-offset and page() uses
107 # 0-offset, so we must adjust.
107 # 0-offset, so we must adjust.
108 with stdlib_io.open(ofile, 'rb') as buffer: # Tweaked to use io.open for Python 2
108 with stdlib_io.open(ofile, 'rb') as buffer: # Tweaked to use io.open for Python 2
109 encoding, lines = openpy.detect_encoding(buffer.readline)
109 encoding, lines = openpy.detect_encoding(buffer.readline)
110 return encoding
110 return encoding
111
111
112 def getdoc(obj):
112 def getdoc(obj):
113 """Stable wrapper around inspect.getdoc.
113 """Stable wrapper around inspect.getdoc.
114
114
115 This can't crash because of attribute problems.
115 This can't crash because of attribute problems.
116
116
117 It also attempts to call a getdoc() method on the given object. This
117 It also attempts to call a getdoc() method on the given object. This
118 allows objects which provide their docstrings via non-standard mechanisms
118 allows objects which provide their docstrings via non-standard mechanisms
119 (like Pyro proxies) to still be inspected by ipython's ? system.
119 (like Pyro proxies) to still be inspected by ipython's ? system.
120 """
120 """
121 # Allow objects to offer customized documentation via a getdoc method:
121 # Allow objects to offer customized documentation via a getdoc method:
122 try:
122 try:
123 ds = obj.getdoc()
123 ds = obj.getdoc()
124 except Exception:
124 except Exception:
125 pass
125 pass
126 else:
126 else:
127 if isinstance(ds, str):
127 if isinstance(ds, str):
128 return inspect.cleandoc(ds)
128 return inspect.cleandoc(ds)
129 docstr = inspect.getdoc(obj)
129 docstr = inspect.getdoc(obj)
130 encoding = get_encoding(obj)
130 encoding = get_encoding(obj)
131 return py3compat.cast_unicode(docstr, encoding=encoding)
131 return py3compat.cast_unicode(docstr, encoding=encoding)
132
132
133
133
134 def getsource(obj, oname=''):
134 def getsource(obj, oname=''):
135 """Wrapper around inspect.getsource.
135 """Wrapper around inspect.getsource.
136
136
137 This can be modified by other projects to provide customized source
137 This can be modified by other projects to provide customized source
138 extraction.
138 extraction.
139
139
140 Parameters
140 Parameters
141 ----------
141 ----------
142 obj : object
142 obj : object
143 an object whose source code we will attempt to extract
143 an object whose source code we will attempt to extract
144 oname : str
144 oname : str
145 (optional) a name under which the object is known
145 (optional) a name under which the object is known
146
146
147 Returns
147 Returns
148 -------
148 -------
149 src : unicode or None
149 src : unicode or None
150
150
151 """
151 """
152
152
153 if isinstance(obj, property):
153 if isinstance(obj, property):
154 sources = []
154 sources = []
155 for attrname in ['fget', 'fset', 'fdel']:
155 for attrname in ['fget', 'fset', 'fdel']:
156 fn = getattr(obj, attrname)
156 fn = getattr(obj, attrname)
157 if fn is not None:
157 if fn is not None:
158 encoding = get_encoding(fn)
158 encoding = get_encoding(fn)
159 oname_prefix = ('%s.' % oname) if oname else ''
159 oname_prefix = ('%s.' % oname) if oname else ''
160 sources.append(cast_unicode(
160 sources.append(cast_unicode(
161 ''.join(('# ', oname_prefix, attrname)),
161 ''.join(('# ', oname_prefix, attrname)),
162 encoding=encoding))
162 encoding=encoding))
163 if inspect.isfunction(fn):
163 if inspect.isfunction(fn):
164 sources.append(dedent(getsource(fn)))
164 sources.append(dedent(getsource(fn)))
165 else:
165 else:
166 # Default str/repr only prints function name,
166 # Default str/repr only prints function name,
167 # pretty.pretty prints module name too.
167 # pretty.pretty prints module name too.
168 sources.append(cast_unicode(
168 sources.append(cast_unicode(
169 '%s%s = %s\n' % (
169 '%s%s = %s\n' % (
170 oname_prefix, attrname, pretty(fn)),
170 oname_prefix, attrname, pretty(fn)),
171 encoding=encoding))
171 encoding=encoding))
172 if sources:
172 if sources:
173 return '\n'.join(sources)
173 return '\n'.join(sources)
174 else:
174 else:
175 return None
175 return None
176
176
177 else:
177 else:
178 # Get source for non-property objects.
178 # Get source for non-property objects.
179
179
180 obj = _get_wrapped(obj)
180 obj = _get_wrapped(obj)
181
181
182 try:
182 try:
183 src = inspect.getsource(obj)
183 src = inspect.getsource(obj)
184 except TypeError:
184 except TypeError:
185 # The object itself provided no meaningful source, try looking for
185 # The object itself provided no meaningful source, try looking for
186 # its class definition instead.
186 # its class definition instead.
187 if hasattr(obj, '__class__'):
187 if hasattr(obj, '__class__'):
188 try:
188 try:
189 src = inspect.getsource(obj.__class__)
189 src = inspect.getsource(obj.__class__)
190 except TypeError:
190 except TypeError:
191 return None
191 return None
192
192
193 encoding = get_encoding(obj)
193 encoding = get_encoding(obj)
194 return cast_unicode(src, encoding=encoding)
194 return cast_unicode(src, encoding=encoding)
195
195
196
196
197 def is_simple_callable(obj):
197 def is_simple_callable(obj):
198 """True if obj is a function ()"""
198 """True if obj is a function ()"""
199 return (inspect.isfunction(obj) or inspect.ismethod(obj) or \
199 return (inspect.isfunction(obj) or inspect.ismethod(obj) or \
200 isinstance(obj, _builtin_func_type) or isinstance(obj, _builtin_meth_type))
200 isinstance(obj, _builtin_func_type) or isinstance(obj, _builtin_meth_type))
201
201
202
202
203 def getargspec(obj):
203 def getargspec(obj):
204 """Wrapper around :func:`inspect.getfullargspec` on Python 3, and
204 """Wrapper around :func:`inspect.getfullargspec` on Python 3, and
205 :func:inspect.getargspec` on Python 2.
205 :func:inspect.getargspec` on Python 2.
206
206
207 In addition to functions and methods, this can also handle objects with a
207 In addition to functions and methods, this can also handle objects with a
208 ``__call__`` attribute.
208 ``__call__`` attribute.
209 """
209 """
210 if safe_hasattr(obj, '__call__') and not is_simple_callable(obj):
210 if safe_hasattr(obj, '__call__') and not is_simple_callable(obj):
211 obj = obj.__call__
211 obj = obj.__call__
212
212
213 return inspect.getfullargspec(obj)
213 return inspect.getfullargspec(obj)
214
214
215
215
216 def format_argspec(argspec):
216 def format_argspec(argspec):
217 """Format argspect, convenience wrapper around inspect's.
217 """Format argspect, convenience wrapper around inspect's.
218
218
219 This takes a dict instead of ordered arguments and calls
219 This takes a dict instead of ordered arguments and calls
220 inspect.format_argspec with the arguments in the necessary order.
220 inspect.format_argspec with the arguments in the necessary order.
221 """
221 """
222 return inspect.formatargspec(argspec['args'], argspec['varargs'],
222 return inspect.formatargspec(argspec['args'], argspec['varargs'],
223 argspec['varkw'], argspec['defaults'])
223 argspec['varkw'], argspec['defaults'])
224
224
225 @undoc
225 @undoc
226 def call_tip(oinfo, format_call=True):
226 def call_tip(oinfo, format_call=True):
227 """DEPRECATED. Extract call tip data from an oinfo dict.
227 """DEPRECATED. Extract call tip data from an oinfo dict.
228 """
228 """
229 warnings.warn('`call_tip` function is deprecated as of IPython 6.0'
229 warnings.warn('`call_tip` function is deprecated as of IPython 6.0'
230 'and will be removed in future versions.', DeprecationWarning, stacklevel=2)
230 'and will be removed in future versions.', DeprecationWarning, stacklevel=2)
231 # Get call definition
231 # Get call definition
232 argspec = oinfo.get('argspec')
232 argspec = oinfo.get('argspec')
233 if argspec is None:
233 if argspec is None:
234 call_line = None
234 call_line = None
235 else:
235 else:
236 # Callable objects will have 'self' as their first argument, prune
236 # Callable objects will have 'self' as their first argument, prune
237 # it out if it's there for clarity (since users do *not* pass an
237 # it out if it's there for clarity (since users do *not* pass an
238 # extra first argument explicitly).
238 # extra first argument explicitly).
239 try:
239 try:
240 has_self = argspec['args'][0] == 'self'
240 has_self = argspec['args'][0] == 'self'
241 except (KeyError, IndexError):
241 except (KeyError, IndexError):
242 pass
242 pass
243 else:
243 else:
244 if has_self:
244 if has_self:
245 argspec['args'] = argspec['args'][1:]
245 argspec['args'] = argspec['args'][1:]
246
246
247 call_line = oinfo['name']+format_argspec(argspec)
247 call_line = oinfo['name']+format_argspec(argspec)
248
248
249 # Now get docstring.
249 # Now get docstring.
250 # The priority is: call docstring, constructor docstring, main one.
250 # The priority is: call docstring, constructor docstring, main one.
251 doc = oinfo.get('call_docstring')
251 doc = oinfo.get('call_docstring')
252 if doc is None:
252 if doc is None:
253 doc = oinfo.get('init_docstring')
253 doc = oinfo.get('init_docstring')
254 if doc is None:
254 if doc is None:
255 doc = oinfo.get('docstring','')
255 doc = oinfo.get('docstring','')
256
256
257 return call_line, doc
257 return call_line, doc
258
258
259
259
260 def _get_wrapped(obj):
260 def _get_wrapped(obj):
261 """Get the original object if wrapped in one or more @decorators
261 """Get the original object if wrapped in one or more @decorators
262
262
263 Some objects automatically construct similar objects on any unrecognised
263 Some objects automatically construct similar objects on any unrecognised
264 attribute access (e.g. unittest.mock.call). To protect against infinite loops,
264 attribute access (e.g. unittest.mock.call). To protect against infinite loops,
265 this will arbitrarily cut off after 100 levels of obj.__wrapped__
265 this will arbitrarily cut off after 100 levels of obj.__wrapped__
266 attribute access. --TK, Jan 2016
266 attribute access. --TK, Jan 2016
267 """
267 """
268 orig_obj = obj
268 orig_obj = obj
269 i = 0
269 i = 0
270 while safe_hasattr(obj, '__wrapped__'):
270 while safe_hasattr(obj, '__wrapped__'):
271 obj = obj.__wrapped__
271 obj = obj.__wrapped__
272 i += 1
272 i += 1
273 if i > 100:
273 if i > 100:
274 # __wrapped__ is probably a lie, so return the thing we started with
274 # __wrapped__ is probably a lie, so return the thing we started with
275 return orig_obj
275 return orig_obj
276 return obj
276 return obj
277
277
278 def find_file(obj):
278 def find_file(obj):
279 """Find the absolute path to the file where an object was defined.
279 """Find the absolute path to the file where an object was defined.
280
280
281 This is essentially a robust wrapper around `inspect.getabsfile`.
281 This is essentially a robust wrapper around `inspect.getabsfile`.
282
282
283 Returns None if no file can be found.
283 Returns None if no file can be found.
284
284
285 Parameters
285 Parameters
286 ----------
286 ----------
287 obj : any Python object
287 obj : any Python object
288
288
289 Returns
289 Returns
290 -------
290 -------
291 fname : str
291 fname : str
292 The absolute path to the file where the object was defined.
292 The absolute path to the file where the object was defined.
293 """
293 """
294 obj = _get_wrapped(obj)
294 obj = _get_wrapped(obj)
295
295
296 fname = None
296 fname = None
297 try:
297 try:
298 fname = inspect.getabsfile(obj)
298 fname = inspect.getabsfile(obj)
299 except TypeError:
299 except TypeError:
300 # For an instance, the file that matters is where its class was
300 # For an instance, the file that matters is where its class was
301 # declared.
301 # declared.
302 if hasattr(obj, '__class__'):
302 if hasattr(obj, '__class__'):
303 try:
303 try:
304 fname = inspect.getabsfile(obj.__class__)
304 fname = inspect.getabsfile(obj.__class__)
305 except TypeError:
305 except TypeError:
306 # Can happen for builtins
306 # Can happen for builtins
307 pass
307 pass
308 except:
308 except:
309 pass
309 pass
310 return cast_unicode(fname)
310 return cast_unicode(fname)
311
311
312
312
313 def find_source_lines(obj):
313 def find_source_lines(obj):
314 """Find the line number in a file where an object was defined.
314 """Find the line number in a file where an object was defined.
315
315
316 This is essentially a robust wrapper around `inspect.getsourcelines`.
316 This is essentially a robust wrapper around `inspect.getsourcelines`.
317
317
318 Returns None if no file can be found.
318 Returns None if no file can be found.
319
319
320 Parameters
320 Parameters
321 ----------
321 ----------
322 obj : any Python object
322 obj : any Python object
323
323
324 Returns
324 Returns
325 -------
325 -------
326 lineno : int
326 lineno : int
327 The line number where the object definition starts.
327 The line number where the object definition starts.
328 """
328 """
329 obj = _get_wrapped(obj)
329 obj = _get_wrapped(obj)
330
330
331 try:
331 try:
332 try:
332 try:
333 lineno = inspect.getsourcelines(obj)[1]
333 lineno = inspect.getsourcelines(obj)[1]
334 except TypeError:
334 except TypeError:
335 # For instances, try the class object like getsource() does
335 # For instances, try the class object like getsource() does
336 if hasattr(obj, '__class__'):
336 if hasattr(obj, '__class__'):
337 lineno = inspect.getsourcelines(obj.__class__)[1]
337 lineno = inspect.getsourcelines(obj.__class__)[1]
338 else:
338 else:
339 lineno = None
339 lineno = None
340 except:
340 except:
341 return None
341 return None
342
342
343 return lineno
343 return lineno
344
344
345 class Inspector(Colorable):
345 class Inspector(Colorable):
346
346
347 def __init__(self, color_table=InspectColors,
347 def __init__(self, color_table=InspectColors,
348 code_color_table=PyColorize.ANSICodeColors,
348 code_color_table=PyColorize.ANSICodeColors,
349 scheme=None,
349 scheme=None,
350 str_detail_level=0,
350 str_detail_level=0,
351 parent=None, config=None):
351 parent=None, config=None):
352 super(Inspector, self).__init__(parent=parent, config=config)
352 super(Inspector, self).__init__(parent=parent, config=config)
353 self.color_table = color_table
353 self.color_table = color_table
354 self.parser = PyColorize.Parser(out='str', parent=self, style=scheme)
354 self.parser = PyColorize.Parser(out='str', parent=self, style=scheme)
355 self.format = self.parser.format
355 self.format = self.parser.format
356 self.str_detail_level = str_detail_level
356 self.str_detail_level = str_detail_level
357 self.set_active_scheme(scheme)
357 self.set_active_scheme(scheme)
358
358
359 def _getdef(self,obj,oname=''):
359 def _getdef(self,obj,oname=''):
360 """Return the call signature for any callable object.
360 """Return the call signature for any callable object.
361
361
362 If any exception is generated, None is returned instead and the
362 If any exception is generated, None is returned instead and the
363 exception is suppressed."""
363 exception is suppressed."""
364 try:
364 try:
365 hdef = _render_signature(signature(obj), oname)
365 hdef = _render_signature(signature(obj), oname)
366 return cast_unicode(hdef)
366 return cast_unicode(hdef)
367 except:
367 except:
368 return None
368 return None
369
369
370 def __head(self,h):
370 def __head(self,h):
371 """Return a header string with proper colors."""
371 """Return a header string with proper colors."""
372 return '%s%s%s' % (self.color_table.active_colors.header,h,
372 return '%s%s%s' % (self.color_table.active_colors.header,h,
373 self.color_table.active_colors.normal)
373 self.color_table.active_colors.normal)
374
374
375 def set_active_scheme(self, scheme):
375 def set_active_scheme(self, scheme):
376 if scheme is not None:
376 if scheme is not None:
377 self.color_table.set_active_scheme(scheme)
377 self.color_table.set_active_scheme(scheme)
378 self.parser.color_table.set_active_scheme(scheme)
378 self.parser.color_table.set_active_scheme(scheme)
379
379
380 def noinfo(self, msg, oname):
380 def noinfo(self, msg, oname):
381 """Generic message when no information is found."""
381 """Generic message when no information is found."""
382 print('No %s found' % msg, end=' ')
382 print('No %s found' % msg, end=' ')
383 if oname:
383 if oname:
384 print('for %s' % oname)
384 print('for %s' % oname)
385 else:
385 else:
386 print()
386 print()
387
387
388 def pdef(self, obj, oname=''):
388 def pdef(self, obj, oname=''):
389 """Print the call signature for any callable object.
389 """Print the call signature for any callable object.
390
390
391 If the object is a class, print the constructor information."""
391 If the object is a class, print the constructor information."""
392
392
393 if not callable(obj):
393 if not callable(obj):
394 print('Object is not callable.')
394 print('Object is not callable.')
395 return
395 return
396
396
397 header = ''
397 header = ''
398
398
399 if inspect.isclass(obj):
399 if inspect.isclass(obj):
400 header = self.__head('Class constructor information:\n')
400 header = self.__head('Class constructor information:\n')
401
401
402
402
403 output = self._getdef(obj,oname)
403 output = self._getdef(obj,oname)
404 if output is None:
404 if output is None:
405 self.noinfo('definition header',oname)
405 self.noinfo('definition header',oname)
406 else:
406 else:
407 print(header,self.format(output), end=' ')
407 print(header,self.format(output), end=' ')
408
408
409 # In Python 3, all classes are new-style, so they all have __init__.
409 # In Python 3, all classes are new-style, so they all have __init__.
410 @skip_doctest
410 @skip_doctest
411 def pdoc(self, obj, oname='', formatter=None):
411 def pdoc(self, obj, oname='', formatter=None):
412 """Print the docstring for any object.
412 """Print the docstring for any object.
413
413
414 Optional:
414 Optional:
415 -formatter: a function to run the docstring through for specially
415 -formatter: a function to run the docstring through for specially
416 formatted docstrings.
416 formatted docstrings.
417
417
418 Examples
418 Examples
419 --------
419 --------
420
420
421 In [1]: class NoInit:
421 In [1]: class NoInit:
422 ...: pass
422 ...: pass
423
423
424 In [2]: class NoDoc:
424 In [2]: class NoDoc:
425 ...: def __init__(self):
425 ...: def __init__(self):
426 ...: pass
426 ...: pass
427
427
428 In [3]: %pdoc NoDoc
428 In [3]: %pdoc NoDoc
429 No documentation found for NoDoc
429 No documentation found for NoDoc
430
430
431 In [4]: %pdoc NoInit
431 In [4]: %pdoc NoInit
432 No documentation found for NoInit
432 No documentation found for NoInit
433
433
434 In [5]: obj = NoInit()
434 In [5]: obj = NoInit()
435
435
436 In [6]: %pdoc obj
436 In [6]: %pdoc obj
437 No documentation found for obj
437 No documentation found for obj
438
438
439 In [5]: obj2 = NoDoc()
439 In [5]: obj2 = NoDoc()
440
440
441 In [6]: %pdoc obj2
441 In [6]: %pdoc obj2
442 No documentation found for obj2
442 No documentation found for obj2
443 """
443 """
444
444
445 head = self.__head # For convenience
445 head = self.__head # For convenience
446 lines = []
446 lines = []
447 ds = getdoc(obj)
447 ds = getdoc(obj)
448 if formatter:
448 if formatter:
449 ds = formatter(ds).get('plain/text', ds)
449 ds = formatter(ds).get('plain/text', ds)
450 if ds:
450 if ds:
451 lines.append(head("Class docstring:"))
451 lines.append(head("Class docstring:"))
452 lines.append(indent(ds))
452 lines.append(indent(ds))
453 if inspect.isclass(obj) and hasattr(obj, '__init__'):
453 if inspect.isclass(obj) and hasattr(obj, '__init__'):
454 init_ds = getdoc(obj.__init__)
454 init_ds = getdoc(obj.__init__)
455 if init_ds is not None:
455 if init_ds is not None:
456 lines.append(head("Init docstring:"))
456 lines.append(head("Init docstring:"))
457 lines.append(indent(init_ds))
457 lines.append(indent(init_ds))
458 elif hasattr(obj,'__call__'):
458 elif hasattr(obj,'__call__'):
459 call_ds = getdoc(obj.__call__)
459 call_ds = getdoc(obj.__call__)
460 if call_ds:
460 if call_ds:
461 lines.append(head("Call docstring:"))
461 lines.append(head("Call docstring:"))
462 lines.append(indent(call_ds))
462 lines.append(indent(call_ds))
463
463
464 if not lines:
464 if not lines:
465 self.noinfo('documentation',oname)
465 self.noinfo('documentation',oname)
466 else:
466 else:
467 page.page('\n'.join(lines))
467 page.page('\n'.join(lines))
468
468
469 def psource(self, obj, oname=''):
469 def psource(self, obj, oname=''):
470 """Print the source code for an object."""
470 """Print the source code for an object."""
471
471
472 # Flush the source cache because inspect can return out-of-date source
472 # Flush the source cache because inspect can return out-of-date source
473 linecache.checkcache()
473 linecache.checkcache()
474 try:
474 try:
475 src = getsource(obj, oname=oname)
475 src = getsource(obj, oname=oname)
476 except Exception:
476 except Exception:
477 src = None
477 src = None
478
478
479 if src is None:
479 if src is None:
480 self.noinfo('source', oname)
480 self.noinfo('source', oname)
481 else:
481 else:
482 page.page(self.format(src))
482 page.page(self.format(src))
483
483
484 def pfile(self, obj, oname=''):
484 def pfile(self, obj, oname=''):
485 """Show the whole file where an object was defined."""
485 """Show the whole file where an object was defined."""
486
486
487 lineno = find_source_lines(obj)
487 lineno = find_source_lines(obj)
488 if lineno is None:
488 if lineno is None:
489 self.noinfo('file', oname)
489 self.noinfo('file', oname)
490 return
490 return
491
491
492 ofile = find_file(obj)
492 ofile = find_file(obj)
493 # run contents of file through pager starting at line where the object
493 # run contents of file through pager starting at line where the object
494 # is defined, as long as the file isn't binary and is actually on the
494 # is defined, as long as the file isn't binary and is actually on the
495 # filesystem.
495 # filesystem.
496 if ofile.endswith(('.so', '.dll', '.pyd')):
496 if ofile.endswith(('.so', '.dll', '.pyd')):
497 print('File %r is binary, not printing.' % ofile)
497 print('File %r is binary, not printing.' % ofile)
498 elif not os.path.isfile(ofile):
498 elif not os.path.isfile(ofile):
499 print('File %r does not exist, not printing.' % ofile)
499 print('File %r does not exist, not printing.' % ofile)
500 else:
500 else:
501 # Print only text files, not extension binaries. Note that
501 # Print only text files, not extension binaries. Note that
502 # getsourcelines returns lineno with 1-offset and page() uses
502 # getsourcelines returns lineno with 1-offset and page() uses
503 # 0-offset, so we must adjust.
503 # 0-offset, so we must adjust.
504 page.page(self.format(openpy.read_py_file(ofile, skip_encoding_cookie=False)), lineno - 1)
504 page.page(self.format(openpy.read_py_file(ofile, skip_encoding_cookie=False)), lineno - 1)
505
505
506 def _format_fields(self, fields, title_width=0):
506 def _format_fields(self, fields, title_width=0):
507 """Formats a list of fields for display.
507 """Formats a list of fields for display.
508
508
509 Parameters
509 Parameters
510 ----------
510 ----------
511 fields : list
511 fields : list
512 A list of 2-tuples: (field_title, field_content)
512 A list of 2-tuples: (field_title, field_content)
513 title_width : int
513 title_width : int
514 How many characters to pad titles to. Default to longest title.
514 How many characters to pad titles to. Default to longest title.
515 """
515 """
516 out = []
516 out = []
517 header = self.__head
517 header = self.__head
518 if title_width == 0:
518 if title_width == 0:
519 title_width = max(len(title) + 2 for title, _ in fields)
519 title_width = max(len(title) + 2 for title, _ in fields)
520 for title, content in fields:
520 for title, content in fields:
521 if len(content.splitlines()) > 1:
521 if len(content.splitlines()) > 1:
522 title = header(title + ':') + '\n'
522 title = header(title + ':') + '\n'
523 else:
523 else:
524 title = header((title + ':').ljust(title_width))
524 title = header((title + ':').ljust(title_width))
525 out.append(cast_unicode(title) + cast_unicode(content))
525 out.append(cast_unicode(title) + cast_unicode(content))
526 return "\n".join(out)
526 return "\n".join(out)
527
527
528 def _mime_format(self, text, formatter=None):
528 def _mime_format(self, text, formatter=None):
529 """Return a mime bundle representation of the input text.
529 """Return a mime bundle representation of the input text.
530
530
531 - if `formatter` is None, the returned mime bundle has
531 - if `formatter` is None, the returned mime bundle has
532 a `text/plain` field, with the input text.
532 a `text/plain` field, with the input text.
533 a `text/html` field with a `<pre>` tag containing the input text.
533 a `text/html` field with a `<pre>` tag containing the input text.
534
534
535 - if `formatter` is not None, it must be a callable transforming the
535 - if `formatter` is not None, it must be a callable transforming the
536 input text into a mime bundle. Default values for `text/plain` and
536 input text into a mime bundle. Default values for `text/plain` and
537 `text/html` representations are the ones described above.
537 `text/html` representations are the ones described above.
538
538
539 Note:
539 Note:
540
540
541 Formatters returning strings are supported but this behavior is deprecated.
541 Formatters returning strings are supported but this behavior is deprecated.
542
542
543 """
543 """
544 text = cast_unicode(text)
544 text = cast_unicode(text)
545 defaults = {
545 defaults = {
546 'text/plain': text,
546 'text/plain': text,
547 'text/html': '<pre>' + text + '</pre>'
547 'text/html': '<pre>' + text + '</pre>'
548 }
548 }
549
549
550 if formatter is None:
550 if formatter is None:
551 return defaults
551 return defaults
552 else:
552 else:
553 formatted = formatter(text)
553 formatted = formatter(text)
554
554
555 if not isinstance(formatted, dict):
555 if not isinstance(formatted, dict):
556 # Handle the deprecated behavior of a formatter returning
556 # Handle the deprecated behavior of a formatter returning
557 # a string instead of a mime bundle.
557 # a string instead of a mime bundle.
558 return {
558 return {
559 'text/plain': formatted,
559 'text/plain': formatted,
560 'text/html': '<pre>' + formatted + '</pre>'
560 'text/html': '<pre>' + formatted + '</pre>'
561 }
561 }
562
562
563 else:
563 else:
564 return dict(defaults, **formatted)
564 return dict(defaults, **formatted)
565
565
566
566
567 def format_mime(self, bundle):
567 def format_mime(self, bundle):
568
568
569 text_plain = bundle['text/plain']
569 text_plain = bundle['text/plain']
570
570
571 text = ''
571 text = ''
572 heads, bodies = list(zip(*text_plain))
572 heads, bodies = list(zip(*text_plain))
573 _len = max(len(h) for h in heads)
573 _len = max(len(h) for h in heads)
574
574
575 for head, body in zip(heads, bodies):
575 for head, body in zip(heads, bodies):
576 body = body.strip('\n')
576 body = body.strip('\n')
577 delim = '\n' if '\n' in body else ' '
577 delim = '\n' if '\n' in body else ' '
578 text += self.__head(head+':') + (_len - len(head))*' ' +delim + body +'\n'
578 text += self.__head(head+':') + (_len - len(head))*' ' +delim + body +'\n'
579
579
580 bundle['text/plain'] = text
580 bundle['text/plain'] = text
581 return bundle
581 return bundle
582
582
583 def _get_info(self, obj, oname='', formatter=None, info=None, detail_level=0):
583 def _get_info(self, obj, oname='', formatter=None, info=None, detail_level=0):
584 """Retrieve an info dict and format it.
584 """Retrieve an info dict and format it.
585
585
586 Parameters
586 Parameters
587 ==========
587 ==========
588
588
589 obj: any
589 obj: any
590 Object to inspect and return info from
590 Object to inspect and return info from
591 oname: str (default: ''):
591 oname: str (default: ''):
592 Name of the variable pointing to `obj`.
592 Name of the variable pointing to `obj`.
593 formatter: callable
593 formatter: callable
594 info:
594 info:
595 already computed information
595 already computed information
596 detail_level: integer
596 detail_level: integer
597 Granularity of detail level, if set to 1, give more information.
597 Granularity of detail level, if set to 1, give more information.
598 """
598 """
599
599
600 info = self._info(obj, oname=oname, info=info, detail_level=detail_level)
600 info = self._info(obj, oname=oname, info=info, detail_level=detail_level)
601
601
602 _mime = {
602 _mime = {
603 'text/plain': [],
603 'text/plain': [],
604 'text/html': '',
604 'text/html': '',
605 }
605 }
606
606
607 def append_field(bundle, title, key, formatter=None):
607 def append_field(bundle, title, key, formatter=None):
608 field = info[key]
608 field = info[key]
609 if field is not None:
609 if field is not None:
610 formatted_field = self._mime_format(field, formatter)
610 formatted_field = self._mime_format(field, formatter)
611 bundle['text/plain'].append((title, formatted_field['text/plain']))
611 bundle['text/plain'].append((title, formatted_field['text/plain']))
612 bundle['text/html'] += '<h1>' + title + '</h1>\n' + formatted_field['text/html'] + '\n'
612 bundle['text/html'] += '<h1>' + title + '</h1>\n' + formatted_field['text/html'] + '\n'
613
613
614 def code_formatter(text):
614 def code_formatter(text):
615 return {
615 return {
616 'text/plain': self.format(text),
616 'text/plain': self.format(text),
617 'text/html': pylight(text)
617 'text/html': pylight(text)
618 }
618 }
619
619
620 if info['isalias']:
620 if info['isalias']:
621 append_field(_mime, 'Repr', 'string_form')
621 append_field(_mime, 'Repr', 'string_form')
622
622
623 elif info['ismagic']:
623 elif info['ismagic']:
624 if detail_level > 0:
624 if detail_level > 0:
625 append_field(_mime, 'Source', 'source', code_formatter)
625 append_field(_mime, 'Source', 'source', code_formatter)
626 else:
626 else:
627 append_field(_mime, 'Docstring', 'docstring', formatter)
627 append_field(_mime, 'Docstring', 'docstring', formatter)
628 append_field(_mime, 'File', 'file')
628 append_field(_mime, 'File', 'file')
629
629
630 elif info['isclass'] or is_simple_callable(obj):
630 elif info['isclass'] or is_simple_callable(obj):
631 # Functions, methods, classes
631 # Functions, methods, classes
632 append_field(_mime, 'Signature', 'definition', code_formatter)
632 append_field(_mime, 'Signature', 'definition', code_formatter)
633 append_field(_mime, 'Init signature', 'init_definition', code_formatter)
633 append_field(_mime, 'Init signature', 'init_definition', code_formatter)
634 append_field(_mime, 'Docstring', 'docstring', formatter)
634 append_field(_mime, 'Docstring', 'docstring', formatter)
635 if detail_level > 0 and info['source']:
635 if detail_level > 0 and info['source']:
636 append_field(_mime, 'Source', 'source', code_formatter)
636 append_field(_mime, 'Source', 'source', code_formatter)
637 else:
637 else:
638 append_field(_mime, 'Init docstring', 'init_docstring', formatter)
638 append_field(_mime, 'Init docstring', 'init_docstring', formatter)
639
639
640 append_field(_mime, 'File', 'file')
640 append_field(_mime, 'File', 'file')
641 append_field(_mime, 'Type', 'type_name')
641 append_field(_mime, 'Type', 'type_name')
642 append_field(_mime, 'Subclasses', 'subclasses')
642 append_field(_mime, 'Subclasses', 'subclasses')
643
643
644 else:
644 else:
645 # General Python objects
645 # General Python objects
646 append_field(_mime, 'Signature', 'definition', code_formatter)
646 append_field(_mime, 'Signature', 'definition', code_formatter)
647 append_field(_mime, 'Call signature', 'call_def', code_formatter)
647 append_field(_mime, 'Call signature', 'call_def', code_formatter)
648 append_field(_mime, 'Type', 'type_name')
648 append_field(_mime, 'Type', 'type_name')
649 append_field(_mime, 'String form', 'string_form')
649 append_field(_mime, 'String form', 'string_form')
650
650
651 # Namespace
651 # Namespace
652 if info['namespace'] != 'Interactive':
652 if info['namespace'] != 'Interactive':
653 append_field(_mime, 'Namespace', 'namespace')
653 append_field(_mime, 'Namespace', 'namespace')
654
654
655 append_field(_mime, 'Length', 'length')
655 append_field(_mime, 'Length', 'length')
656 append_field(_mime, 'File', 'file')
656 append_field(_mime, 'File', 'file')
657
657
658 # Source or docstring, depending on detail level and whether
658 # Source or docstring, depending on detail level and whether
659 # source found.
659 # source found.
660 if detail_level > 0 and info['source']:
660 if detail_level > 0 and info['source']:
661 append_field(_mime, 'Source', 'source', code_formatter)
661 append_field(_mime, 'Source', 'source', code_formatter)
662 else:
662 else:
663 append_field(_mime, 'Docstring', 'docstring', formatter)
663 append_field(_mime, 'Docstring', 'docstring', formatter)
664
664
665 append_field(_mime, 'Class docstring', 'class_docstring', formatter)
665 append_field(_mime, 'Class docstring', 'class_docstring', formatter)
666 append_field(_mime, 'Init docstring', 'init_docstring', formatter)
666 append_field(_mime, 'Init docstring', 'init_docstring', formatter)
667 append_field(_mime, 'Call docstring', 'call_docstring', formatter)
667 append_field(_mime, 'Call docstring', 'call_docstring', formatter)
668
668
669
669
670 return self.format_mime(_mime)
670 return self.format_mime(_mime)
671
671
672 def pinfo(self, obj, oname='', formatter=None, info=None, detail_level=0, enable_html_pager=True):
672 def pinfo(self, obj, oname='', formatter=None, info=None, detail_level=0, enable_html_pager=True):
673 """Show detailed information about an object.
673 """Show detailed information about an object.
674
674
675 Optional arguments:
675 Optional arguments:
676
676
677 - oname: name of the variable pointing to the object.
677 - oname: name of the variable pointing to the object.
678
678
679 - formatter: callable (optional)
679 - formatter: callable (optional)
680 A special formatter for docstrings.
680 A special formatter for docstrings.
681
681
682 The formatter is a callable that takes a string as an input
682 The formatter is a callable that takes a string as an input
683 and returns either a formatted string or a mime type bundle
683 and returns either a formatted string or a mime type bundle
684 in the form of a dictionary.
684 in the form of a dictionary.
685
685
686 Although the support of custom formatter returning a string
686 Although the support of custom formatter returning a string
687 instead of a mime type bundle is deprecated.
687 instead of a mime type bundle is deprecated.
688
688
689 - info: a structure with some information fields which may have been
689 - info: a structure with some information fields which may have been
690 precomputed already.
690 precomputed already.
691
691
692 - detail_level: if set to 1, more information is given.
692 - detail_level: if set to 1, more information is given.
693 """
693 """
694 info = self._get_info(obj, oname, formatter, info, detail_level)
694 info = self._get_info(obj, oname, formatter, info, detail_level)
695 if not enable_html_pager:
695 if not enable_html_pager:
696 del info['text/html']
696 del info['text/html']
697 page.page(info)
697 page.page(info)
698
698
699 def info(self, obj, oname='', formatter=None, info=None, detail_level=0):
699 def info(self, obj, oname='', formatter=None, info=None, detail_level=0):
700 """DEPRECATED. Compute a dict with detailed information about an object.
700 """DEPRECATED. Compute a dict with detailed information about an object.
701 """
701 """
702 if formatter is not None:
702 if formatter is not None:
703 warnings.warn('The `formatter` keyword argument to `Inspector.info`'
703 warnings.warn('The `formatter` keyword argument to `Inspector.info`'
704 'is deprecated as of IPython 5.0 and will have no effects.',
704 'is deprecated as of IPython 5.0 and will have no effects.',
705 DeprecationWarning, stacklevel=2)
705 DeprecationWarning, stacklevel=2)
706 return self._info(obj, oname=oname, info=info, detail_level=detail_level)
706 return self._info(obj, oname=oname, info=info, detail_level=detail_level)
707
707
708 def _info(self, obj, oname='', info=None, detail_level=0) -> dict:
708 def _info(self, obj, oname='', info=None, detail_level=0) -> dict:
709 """Compute a dict with detailed information about an object.
709 """Compute a dict with detailed information about an object.
710
710
711 Parameters
711 Parameters
712 ==========
712 ==========
713
713
714 obj: any
714 obj: any
715 An object to find information about
715 An object to find information about
716 oname: str (default: ''):
716 oname: str (default: ''):
717 Name of the variable pointing to `obj`.
717 Name of the variable pointing to `obj`.
718 info: (default: None)
718 info: (default: None)
719 A struct (dict like with attr access) with some information fields
719 A struct (dict like with attr access) with some information fields
720 which may have been precomputed already.
720 which may have been precomputed already.
721 detail_level: int (default:0)
721 detail_level: int (default:0)
722 If set to 1, more information is given.
722 If set to 1, more information is given.
723
723
724 Returns
724 Returns
725 =======
725 =======
726
726
727 An object info dict with known fields from `info_fields`.
727 An object info dict with known fields from `info_fields`.
728 """
728 """
729
729
730 if info is None:
730 if info is None:
731 ismagic = False
731 ismagic = False
732 isalias = False
732 isalias = False
733 ospace = ''
733 ospace = ''
734 else:
734 else:
735 ismagic = info.ismagic
735 ismagic = info.ismagic
736 isalias = info.isalias
736 isalias = info.isalias
737 ospace = info.namespace
737 ospace = info.namespace
738
738
739 # Get docstring, special-casing aliases:
739 # Get docstring, special-casing aliases:
740 if isalias:
740 if isalias:
741 if not callable(obj):
741 if not callable(obj):
742 try:
742 try:
743 ds = "Alias to the system command:\n %s" % obj[1]
743 ds = "Alias to the system command:\n %s" % obj[1]
744 except:
744 except:
745 ds = "Alias: " + str(obj)
745 ds = "Alias: " + str(obj)
746 else:
746 else:
747 ds = "Alias to " + str(obj)
747 ds = "Alias to " + str(obj)
748 if obj.__doc__:
748 if obj.__doc__:
749 ds += "\nDocstring:\n" + obj.__doc__
749 ds += "\nDocstring:\n" + obj.__doc__
750 else:
750 else:
751 ds = getdoc(obj)
751 ds = getdoc(obj)
752 if ds is None:
752 if ds is None:
753 ds = '<no docstring>'
753 ds = '<no docstring>'
754
754
755 # store output in a dict, we initialize it here and fill it as we go
755 # store output in a dict, we initialize it here and fill it as we go
756 out = dict(name=oname, found=True, isalias=isalias, ismagic=ismagic, subclasses=None)
756 out = dict(name=oname, found=True, isalias=isalias, ismagic=ismagic, subclasses=None)
757
757
758 string_max = 200 # max size of strings to show (snipped if longer)
758 string_max = 200 # max size of strings to show (snipped if longer)
759 shalf = int((string_max - 5) / 2)
759 shalf = int((string_max - 5) / 2)
760
760
761 if ismagic:
761 if ismagic:
762 out['type_name'] = 'Magic function'
762 out['type_name'] = 'Magic function'
763 elif isalias:
763 elif isalias:
764 out['type_name'] = 'System alias'
764 out['type_name'] = 'System alias'
765 else:
765 else:
766 out['type_name'] = type(obj).__name__
766 out['type_name'] = type(obj).__name__
767
767
768 try:
768 try:
769 bclass = obj.__class__
769 bclass = obj.__class__
770 out['base_class'] = str(bclass)
770 out['base_class'] = str(bclass)
771 except:
771 except:
772 pass
772 pass
773
773
774 # String form, but snip if too long in ? form (full in ??)
774 # String form, but snip if too long in ? form (full in ??)
775 if detail_level >= self.str_detail_level:
775 if detail_level >= self.str_detail_level:
776 try:
776 try:
777 ostr = str(obj)
777 ostr = str(obj)
778 str_head = 'string_form'
778 str_head = 'string_form'
779 if not detail_level and len(ostr)>string_max:
779 if not detail_level and len(ostr)>string_max:
780 ostr = ostr[:shalf] + ' <...> ' + ostr[-shalf:]
780 ostr = ostr[:shalf] + ' <...> ' + ostr[-shalf:]
781 ostr = ("\n" + " " * len(str_head.expandtabs())).\
781 ostr = ("\n" + " " * len(str_head.expandtabs())).\
782 join(q.strip() for q in ostr.split("\n"))
782 join(q.strip() for q in ostr.split("\n"))
783 out[str_head] = ostr
783 out[str_head] = ostr
784 except:
784 except:
785 pass
785 pass
786
786
787 if ospace:
787 if ospace:
788 out['namespace'] = ospace
788 out['namespace'] = ospace
789
789
790 # Length (for strings and lists)
790 # Length (for strings and lists)
791 try:
791 try:
792 out['length'] = str(len(obj))
792 out['length'] = str(len(obj))
793 except Exception:
793 except Exception:
794 pass
794 pass
795
795
796 # Filename where object was defined
796 # Filename where object was defined
797 binary_file = False
797 binary_file = False
798 fname = find_file(obj)
798 fname = find_file(obj)
799 if fname is None:
799 if fname is None:
800 # if anything goes wrong, we don't want to show source, so it's as
800 # if anything goes wrong, we don't want to show source, so it's as
801 # if the file was binary
801 # if the file was binary
802 binary_file = True
802 binary_file = True
803 else:
803 else:
804 if fname.endswith(('.so', '.dll', '.pyd')):
804 if fname.endswith(('.so', '.dll', '.pyd')):
805 binary_file = True
805 binary_file = True
806 elif fname.endswith('<string>'):
806 elif fname.endswith('<string>'):
807 fname = 'Dynamically generated function. No source code available.'
807 fname = 'Dynamically generated function. No source code available.'
808 out['file'] = compress_user(fname)
808 out['file'] = compress_user(fname)
809
809
810 # Original source code for a callable, class or property.
810 # Original source code for a callable, class or property.
811 if detail_level:
811 if detail_level:
812 # Flush the source cache because inspect can return out-of-date
812 # Flush the source cache because inspect can return out-of-date
813 # source
813 # source
814 linecache.checkcache()
814 linecache.checkcache()
815 try:
815 try:
816 if isinstance(obj, property) or not binary_file:
816 if isinstance(obj, property) or not binary_file:
817 src = getsource(obj, oname)
817 src = getsource(obj, oname)
818 if src is not None:
818 if src is not None:
819 src = src.rstrip()
819 src = src.rstrip()
820 out['source'] = src
820 out['source'] = src
821
821
822 except Exception:
822 except Exception:
823 pass
823 pass
824
824
825 # Add docstring only if no source is to be shown (avoid repetitions).
825 # Add docstring only if no source is to be shown (avoid repetitions).
826 if ds and not self._source_contains_docstring(out.get('source'), ds):
826 if ds and not self._source_contains_docstring(out.get('source'), ds):
827 out['docstring'] = ds
827 out['docstring'] = ds
828
828
829 # Constructor docstring for classes
829 # Constructor docstring for classes
830 if inspect.isclass(obj):
830 if inspect.isclass(obj):
831 out['isclass'] = True
831 out['isclass'] = True
832
832
833 # get the init signature:
833 # get the init signature:
834 try:
834 try:
835 init_def = self._getdef(obj, oname)
835 init_def = self._getdef(obj, oname)
836 except AttributeError:
836 except AttributeError:
837 init_def = None
837 init_def = None
838
838
839 # get the __init__ docstring
839 # get the __init__ docstring
840 try:
840 try:
841 obj_init = obj.__init__
841 obj_init = obj.__init__
842 except AttributeError:
842 except AttributeError:
843 init_ds = None
843 init_ds = None
844 else:
844 else:
845 if init_def is None:
845 if init_def is None:
846 # Get signature from init if top-level sig failed.
846 # Get signature from init if top-level sig failed.
847 # Can happen for built-in types (list, etc.).
847 # Can happen for built-in types (list, etc.).
848 try:
848 try:
849 init_def = self._getdef(obj_init, oname)
849 init_def = self._getdef(obj_init, oname)
850 except AttributeError:
850 except AttributeError:
851 pass
851 pass
852 init_ds = getdoc(obj_init)
852 init_ds = getdoc(obj_init)
853 # Skip Python's auto-generated docstrings
853 # Skip Python's auto-generated docstrings
854 if init_ds == _object_init_docstring:
854 if init_ds == _object_init_docstring:
855 init_ds = None
855 init_ds = None
856
856
857 if init_def:
857 if init_def:
858 out['init_definition'] = init_def
858 out['init_definition'] = init_def
859
859
860 if init_ds:
860 if init_ds:
861 out['init_docstring'] = init_ds
861 out['init_docstring'] = init_ds
862
862
863 names = [sub.__name__ for sub in obj.__subclasses__()]
863 names = [sub.__name__ for sub in obj.__subclasses__()]
864 if len(names) < 10:
864 all_names = ', '.join(names)
865 all_names = ', '.join(names)
866 else:
867 all_names = ', '.join(names[:10]+['...'])
865 out['subclasses'] = all_names
868 out['subclasses'] = all_names
866 # and class docstring for instances:
869 # and class docstring for instances:
867 else:
870 else:
868 # reconstruct the function definition and print it:
871 # reconstruct the function definition and print it:
869 defln = self._getdef(obj, oname)
872 defln = self._getdef(obj, oname)
870 if defln:
873 if defln:
871 out['definition'] = defln
874 out['definition'] = defln
872
875
873 # First, check whether the instance docstring is identical to the
876 # First, check whether the instance docstring is identical to the
874 # class one, and print it separately if they don't coincide. In
877 # class one, and print it separately if they don't coincide. In
875 # most cases they will, but it's nice to print all the info for
878 # most cases they will, but it's nice to print all the info for
876 # objects which use instance-customized docstrings.
879 # objects which use instance-customized docstrings.
877 if ds:
880 if ds:
878 try:
881 try:
879 cls = getattr(obj,'__class__')
882 cls = getattr(obj,'__class__')
880 except:
883 except:
881 class_ds = None
884 class_ds = None
882 else:
885 else:
883 class_ds = getdoc(cls)
886 class_ds = getdoc(cls)
884 # Skip Python's auto-generated docstrings
887 # Skip Python's auto-generated docstrings
885 if class_ds in _builtin_type_docstrings:
888 if class_ds in _builtin_type_docstrings:
886 class_ds = None
889 class_ds = None
887 if class_ds and ds != class_ds:
890 if class_ds and ds != class_ds:
888 out['class_docstring'] = class_ds
891 out['class_docstring'] = class_ds
889
892
890 # Next, try to show constructor docstrings
893 # Next, try to show constructor docstrings
891 try:
894 try:
892 init_ds = getdoc(obj.__init__)
895 init_ds = getdoc(obj.__init__)
893 # Skip Python's auto-generated docstrings
896 # Skip Python's auto-generated docstrings
894 if init_ds == _object_init_docstring:
897 if init_ds == _object_init_docstring:
895 init_ds = None
898 init_ds = None
896 except AttributeError:
899 except AttributeError:
897 init_ds = None
900 init_ds = None
898 if init_ds:
901 if init_ds:
899 out['init_docstring'] = init_ds
902 out['init_docstring'] = init_ds
900
903
901 # Call form docstring for callable instances
904 # Call form docstring for callable instances
902 if safe_hasattr(obj, '__call__') and not is_simple_callable(obj):
905 if safe_hasattr(obj, '__call__') and not is_simple_callable(obj):
903 call_def = self._getdef(obj.__call__, oname)
906 call_def = self._getdef(obj.__call__, oname)
904 if call_def and (call_def != out.get('definition')):
907 if call_def and (call_def != out.get('definition')):
905 # it may never be the case that call def and definition differ,
908 # it may never be the case that call def and definition differ,
906 # but don't include the same signature twice
909 # but don't include the same signature twice
907 out['call_def'] = call_def
910 out['call_def'] = call_def
908 call_ds = getdoc(obj.__call__)
911 call_ds = getdoc(obj.__call__)
909 # Skip Python's auto-generated docstrings
912 # Skip Python's auto-generated docstrings
910 if call_ds == _func_call_docstring:
913 if call_ds == _func_call_docstring:
911 call_ds = None
914 call_ds = None
912 if call_ds:
915 if call_ds:
913 out['call_docstring'] = call_ds
916 out['call_docstring'] = call_ds
914
917
915 # Compute the object's argspec as a callable. The key is to decide
918 # Compute the object's argspec as a callable. The key is to decide
916 # whether to pull it from the object itself, from its __init__ or
919 # whether to pull it from the object itself, from its __init__ or
917 # from its __call__ method.
920 # from its __call__ method.
918
921
919 if inspect.isclass(obj):
922 if inspect.isclass(obj):
920 # Old-style classes need not have an __init__
923 # Old-style classes need not have an __init__
921 callable_obj = getattr(obj, "__init__", None)
924 callable_obj = getattr(obj, "__init__", None)
922 elif callable(obj):
925 elif callable(obj):
923 callable_obj = obj
926 callable_obj = obj
924 else:
927 else:
925 callable_obj = None
928 callable_obj = None
926
929
927 if callable_obj is not None:
930 if callable_obj is not None:
928 try:
931 try:
929 argspec = getargspec(callable_obj)
932 argspec = getargspec(callable_obj)
930 except Exception:
933 except Exception:
931 # For extensions/builtins we can't retrieve the argspec
934 # For extensions/builtins we can't retrieve the argspec
932 pass
935 pass
933 else:
936 else:
934 # named tuples' _asdict() method returns an OrderedDict, but we
937 # named tuples' _asdict() method returns an OrderedDict, but we
935 # we want a normal
938 # we want a normal
936 out['argspec'] = argspec_dict = dict(argspec._asdict())
939 out['argspec'] = argspec_dict = dict(argspec._asdict())
937 # We called this varkw before argspec became a named tuple.
940 # We called this varkw before argspec became a named tuple.
938 # With getfullargspec it's also called varkw.
941 # With getfullargspec it's also called varkw.
939 if 'varkw' not in argspec_dict:
942 if 'varkw' not in argspec_dict:
940 argspec_dict['varkw'] = argspec_dict.pop('keywords')
943 argspec_dict['varkw'] = argspec_dict.pop('keywords')
941
944
942 return object_info(**out)
945 return object_info(**out)
943
946
944 @staticmethod
947 @staticmethod
945 def _source_contains_docstring(src, doc):
948 def _source_contains_docstring(src, doc):
946 """
949 """
947 Check whether the source *src* contains the docstring *doc*.
950 Check whether the source *src* contains the docstring *doc*.
948
951
949 This is is helper function to skip displaying the docstring if the
952 This is is helper function to skip displaying the docstring if the
950 source already contains it, avoiding repetition of information.
953 source already contains it, avoiding repetition of information.
951 """
954 """
952 try:
955 try:
953 def_node, = ast.parse(dedent(src)).body
956 def_node, = ast.parse(dedent(src)).body
954 return ast.get_docstring(def_node) == doc
957 return ast.get_docstring(def_node) == doc
955 except Exception:
958 except Exception:
956 # The source can become invalid or even non-existent (because it
959 # The source can become invalid or even non-existent (because it
957 # is re-fetched from the source file) so the above code fail in
960 # is re-fetched from the source file) so the above code fail in
958 # arbitrary ways.
961 # arbitrary ways.
959 return False
962 return False
960
963
961 def psearch(self,pattern,ns_table,ns_search=[],
964 def psearch(self,pattern,ns_table,ns_search=[],
962 ignore_case=False,show_all=False):
965 ignore_case=False,show_all=False):
963 """Search namespaces with wildcards for objects.
966 """Search namespaces with wildcards for objects.
964
967
965 Arguments:
968 Arguments:
966
969
967 - pattern: string containing shell-like wildcards to use in namespace
970 - pattern: string containing shell-like wildcards to use in namespace
968 searches and optionally a type specification to narrow the search to
971 searches and optionally a type specification to narrow the search to
969 objects of that type.
972 objects of that type.
970
973
971 - ns_table: dict of name->namespaces for search.
974 - ns_table: dict of name->namespaces for search.
972
975
973 Optional arguments:
976 Optional arguments:
974
977
975 - ns_search: list of namespace names to include in search.
978 - ns_search: list of namespace names to include in search.
976
979
977 - ignore_case(False): make the search case-insensitive.
980 - ignore_case(False): make the search case-insensitive.
978
981
979 - show_all(False): show all names, including those starting with
982 - show_all(False): show all names, including those starting with
980 underscores.
983 underscores.
981 """
984 """
982 #print 'ps pattern:<%r>' % pattern # dbg
985 #print 'ps pattern:<%r>' % pattern # dbg
983
986
984 # defaults
987 # defaults
985 type_pattern = 'all'
988 type_pattern = 'all'
986 filter = ''
989 filter = ''
987
990
988 cmds = pattern.split()
991 cmds = pattern.split()
989 len_cmds = len(cmds)
992 len_cmds = len(cmds)
990 if len_cmds == 1:
993 if len_cmds == 1:
991 # Only filter pattern given
994 # Only filter pattern given
992 filter = cmds[0]
995 filter = cmds[0]
993 elif len_cmds == 2:
996 elif len_cmds == 2:
994 # Both filter and type specified
997 # Both filter and type specified
995 filter,type_pattern = cmds
998 filter,type_pattern = cmds
996 else:
999 else:
997 raise ValueError('invalid argument string for psearch: <%s>' %
1000 raise ValueError('invalid argument string for psearch: <%s>' %
998 pattern)
1001 pattern)
999
1002
1000 # filter search namespaces
1003 # filter search namespaces
1001 for name in ns_search:
1004 for name in ns_search:
1002 if name not in ns_table:
1005 if name not in ns_table:
1003 raise ValueError('invalid namespace <%s>. Valid names: %s' %
1006 raise ValueError('invalid namespace <%s>. Valid names: %s' %
1004 (name,ns_table.keys()))
1007 (name,ns_table.keys()))
1005
1008
1006 #print 'type_pattern:',type_pattern # dbg
1009 #print 'type_pattern:',type_pattern # dbg
1007 search_result, namespaces_seen = set(), set()
1010 search_result, namespaces_seen = set(), set()
1008 for ns_name in ns_search:
1011 for ns_name in ns_search:
1009 ns = ns_table[ns_name]
1012 ns = ns_table[ns_name]
1010 # Normally, locals and globals are the same, so we just check one.
1013 # Normally, locals and globals are the same, so we just check one.
1011 if id(ns) in namespaces_seen:
1014 if id(ns) in namespaces_seen:
1012 continue
1015 continue
1013 namespaces_seen.add(id(ns))
1016 namespaces_seen.add(id(ns))
1014 tmp_res = list_namespace(ns, type_pattern, filter,
1017 tmp_res = list_namespace(ns, type_pattern, filter,
1015 ignore_case=ignore_case, show_all=show_all)
1018 ignore_case=ignore_case, show_all=show_all)
1016 search_result.update(tmp_res)
1019 search_result.update(tmp_res)
1017
1020
1018 page.page('\n'.join(sorted(search_result)))
1021 page.page('\n'.join(sorted(search_result)))
1019
1022
1020
1023
1021 def _render_signature(obj_signature, obj_name):
1024 def _render_signature(obj_signature, obj_name):
1022 """
1025 """
1023 This was mostly taken from inspect.Signature.__str__.
1026 This was mostly taken from inspect.Signature.__str__.
1024 Look there for the comments.
1027 Look there for the comments.
1025 The only change is to add linebreaks when this gets too long.
1028 The only change is to add linebreaks when this gets too long.
1026 """
1029 """
1027 result = []
1030 result = []
1028 pos_only = False
1031 pos_only = False
1029 kw_only = True
1032 kw_only = True
1030 for param in obj_signature.parameters.values():
1033 for param in obj_signature.parameters.values():
1031 if param.kind == inspect._POSITIONAL_ONLY:
1034 if param.kind == inspect._POSITIONAL_ONLY:
1032 pos_only = True
1035 pos_only = True
1033 elif pos_only:
1036 elif pos_only:
1034 result.append('/')
1037 result.append('/')
1035 pos_only = False
1038 pos_only = False
1036
1039
1037 if param.kind == inspect._VAR_POSITIONAL:
1040 if param.kind == inspect._VAR_POSITIONAL:
1038 kw_only = False
1041 kw_only = False
1039 elif param.kind == inspect._KEYWORD_ONLY and kw_only:
1042 elif param.kind == inspect._KEYWORD_ONLY and kw_only:
1040 result.append('*')
1043 result.append('*')
1041 kw_only = False
1044 kw_only = False
1042
1045
1043 result.append(str(param))
1046 result.append(str(param))
1044
1047
1045 if pos_only:
1048 if pos_only:
1046 result.append('/')
1049 result.append('/')
1047
1050
1048 # add up name, parameters, braces (2), and commas
1051 # add up name, parameters, braces (2), and commas
1049 if len(obj_name) + sum(len(r) + 2 for r in result) > 75:
1052 if len(obj_name) + sum(len(r) + 2 for r in result) > 75:
1050 # This doesn’t fit behind “Signature: ” in an inspect window.
1053 # This doesn’t fit behind “Signature: ” in an inspect window.
1051 rendered = '{}(\n{})'.format(obj_name, ''.join(' {},\n'.format(result)))
1054 rendered = '{}(\n{})'.format(obj_name, ''.join(' {},\n'.format(result)))
1052 else:
1055 else:
1053 rendered = '{}({})'.format(obj_name, ', '.join(result))
1056 rendered = '{}({})'.format(obj_name, ', '.join(result))
1054
1057
1055 if obj_signature.return_annotation is not inspect._empty:
1058 if obj_signature.return_annotation is not inspect._empty:
1056 anno = inspect.formatannotation(obj_signature.return_annotation)
1059 anno = inspect.formatannotation(obj_signature.return_annotation)
1057 rendered += ' -> {}'.format(anno)
1060 rendered += ' -> {}'.format(anno)
1058
1061
1059 return rendered
1062 return rendered
@@ -1,354 +1,406 b''
1 ============
1 ============
2 7.x Series
2 7.x Series
3 ============
3 ============
4
4
5 .. _whatsnew720:
6
7 IPython 7.2.0
8 =============
9
10 IPython 7.2.0 bring minor fixes, improvement and new options.
11
12 - Fix a bug preventing to enable PySide2 gui integration :ghpull:`11464`
13 - Run CI on Mac OS ! :ghpull:`11471`
14 - Fix IPython "Demo" mode. :ghpull:`11498`
15 - Fix ``%run`` magic with path in name :ghpull:`11499`
16 - Fix: add CWD to sys.path *after* stdlib :ghpull:`11502`
17 - Better rendering of signatures, especially long ones. :ghpull:`11505`
18 - Re enable jedi by default if installed :ghpull:`11506`
19 - Add New ``minimal`` exception reporting mode (useful for educational purpose). See :ghpull:`11509`
20
21
22 Added ability to show subclasses when using pinfo and other utilities
23 ---------------------------------------------------------------------
24
25 When using ``?``/``??`` on a class, IPython will now list the first 10 subclasses.
26
27 Special Thanks to Chris Mentzel of the Moore Foundation for this feature, Chris
28 is one of the people who played a critical role in IPython/Jupyter getting
29 funding.
30
31 We are grateful for all the help Chris gave us through the years, We are now
32 proud to have code contributed by Chris in IPython.
33
34 OSMagics.cd_force_quiet configuration option
35 --------------------------------------------
36
37 You can set this option to force the %cd magic to behave as if ``-q`` was passed:
38 ::
39
40 In [1]: cd /
41 /
42
43 In [2]: %config OSMagics.cd_force_quiet = True
44
45 In [3]: cd /tmp
46
47 In [4]:
48
49 See :ghpull:`11491`
50
51 In vi editing mode, whether the prompt includes the current vi mode can now be configured
52 -----------------------------------------------------------------------------------------
53
54 Set the ``TerminalInteractiveShell.prompt_includes_vi_mode`` to a boolean value
55 (default: True) to control this feature. See :ghpull:`11492`
56
5 .. _whatsnew710:
57 .. _whatsnew710:
6
58
7 IPython 7.1.0
59 IPython 7.1.0
8 =============
60 =============
9
61
10 IPython 7.1.0 is the first minor release after 7.0.0 and mostly bring fixes to
62 IPython 7.1.0 is the first minor release after 7.0.0 and mostly bring fixes to
11 new feature, internal refactor and regressions that happen during the 6.x->7.x
63 new feature, internal refactor and regressions that happen during the 6.x->7.x
12 transition. It also bring **Compatibility with Python 3.7.1**, as were
64 transition. It also bring **Compatibility with Python 3.7.1**, as were
13 unwillingly relying on a bug in CPython.
65 unwillingly relying on a bug in CPython.
14
66
15 New Core Dev:
67 New Core Dev:
16
68
17 - We welcome Jonathan Slenders to the commiters. Jonathan has done a fantastic
69 - We welcome Jonathan Slenders to the commiters. Jonathan has done a fantastic
18 work on Prompt toolkit, and we'd like to recognise his impact by giving him
70 work on Prompt toolkit, and we'd like to recognise his impact by giving him
19 commit rights. :ghissue:`11397`
71 commit rights. :ghissue:`11397`
20
72
21 Notables Changes
73 Notables Changes
22
74
23 - Major update of "latex to unicode" tab completion map (see below)
75 - Major update of "latex to unicode" tab completion map (see below)
24
76
25 Notable New Features:
77 Notable New Features:
26
78
27 - Restore functionality and documentation of the **sphinx directive**, which
79 - Restore functionality and documentation of the **sphinx directive**, which
28 is now stricter (fail on error by default), gained configuration options,
80 is now stricter (fail on error by default), gained configuration options,
29 have a brand new documentation page :ref:`ipython_directive`, which need
81 have a brand new documentation page :ref:`ipython_directive`, which need
30 some cleanup. It is also now *tested* so we hope to have less regressions.
82 some cleanup. It is also now *tested* so we hope to have less regressions.
31 :ghpull:`11402`
83 :ghpull:`11402`
32
84
33 - ``IPython.display.Video`` now supports ``width`` and ``height`` arguments,
85 - ``IPython.display.Video`` now supports ``width`` and ``height`` arguments,
34 allowing a custom width and height to be set instead of using the video's
86 allowing a custom width and height to be set instead of using the video's
35 width and height. :ghpull:`11353`
87 width and height. :ghpull:`11353`
36
88
37 - Warn when using ``HTML('<iframe>')`` instead of ``IFrame`` :ghpull:`11350`
89 - Warn when using ``HTML('<iframe>')`` instead of ``IFrame`` :ghpull:`11350`
38
90
39 - Allow Dynamic switching of editing mode between vi/emacs and show
91 - Allow Dynamic switching of editing mode between vi/emacs and show
40 normal/input mode in prompt when using vi. :ghpull:`11390`. Use ``%config
92 normal/input mode in prompt when using vi. :ghpull:`11390`. Use ``%config
41 TerminalInteractiveShell.editing_mode = 'vi'`` or ``%config
93 TerminalInteractiveShell.editing_mode = 'vi'`` or ``%config
42 TerminalInteractiveShell.editing_mode = 'emacs'`` to dynamically spwitch
94 TerminalInteractiveShell.editing_mode = 'emacs'`` to dynamically spwitch
43
95
44
96
45 Notable Fixes:
97 Notable Fixes:
46
98
47 - Fix entering of **multi-line block in terminal** IPython, and various
99 - Fix entering of **multi-line block in terminal** IPython, and various
48 crashes in the new input transformation machinery :ghpull:`11354`,
100 crashes in the new input transformation machinery :ghpull:`11354`,
49 :ghpull:`11356`, :ghpull:`11358`, these ones also fix a **Compatibility but
101 :ghpull:`11356`, :ghpull:`11358`, these ones also fix a **Compatibility but
50 with Python 3.7.1**.
102 with Python 3.7.1**.
51
103
52 - Fix moving through generator stack in ipdb :ghpull:`11266`
104 - Fix moving through generator stack in ipdb :ghpull:`11266`
53
105
54 - Magics arguments now support quoting. :ghpull:`11330`
106 - Magics arguments now support quoting. :ghpull:`11330`
55
107
56 - Re-add ``rprint`` and ``rprinte`` aliases. :ghpull:`11331`
108 - Re-add ``rprint`` and ``rprinte`` aliases. :ghpull:`11331`
57
109
58 - Remove implicit dependency to ``ipython_genutils`` :ghpull:`11317`
110 - Remove implicit dependency to ``ipython_genutils`` :ghpull:`11317`
59
111
60 - Make ``nonlocal`` raise ``SyntaxError`` instead of silently failing in async
112 - Make ``nonlocal`` raise ``SyntaxError`` instead of silently failing in async
61 mode. :ghpull:`11382`
113 mode. :ghpull:`11382`
62
114
63 - Fix mishandling of magics and ``= !`` assignment just after a dedent in
115 - Fix mishandling of magics and ``= !`` assignment just after a dedent in
64 nested code blocks :ghpull:`11418`
116 nested code blocks :ghpull:`11418`
65
117
66 - Fix instructions for custom shortcuts :ghpull:`11426`
118 - Fix instructions for custom shortcuts :ghpull:`11426`
67
119
68
120
69 Notable Internals improvements:
121 Notable Internals improvements:
70
122
71 - Use of ``os.scandir`` (Python 3 only) to speedup some file system operations.
123 - Use of ``os.scandir`` (Python 3 only) to speedup some file system operations.
72 :ghpull:`11365`
124 :ghpull:`11365`
73
125
74 - use ``perf_counter`` instead of ``clock`` for more precise
126 - use ``perf_counter`` instead of ``clock`` for more precise
75 timing result with ``%time`` :ghpull:`11376`
127 timing result with ``%time`` :ghpull:`11376`
76
128
77 Many thanks to all the contributors and in particular to ``bartskowron``, and
129 Many thanks to all the contributors and in particular to ``bartskowron``, and
78 ``tonyfast`` who handled a pretty complicated bugs in the input machinery. We
130 ``tonyfast`` who handled a pretty complicated bugs in the input machinery. We
79 had a number of first time contributors and maybe hacktoberfest participant that
131 had a number of first time contributors and maybe hacktoberfest participant that
80 made significant contributions, and helped us free some time to focus on more
132 made significant contributions, and helped us free some time to focus on more
81 complicated bugs.
133 complicated bugs.
82
134
83 You
135 You
84 can see all the closed issues and Merged PR, new features and fixes `here
136 can see all the closed issues and Merged PR, new features and fixes `here
85 <https://github.com/ipython/ipython/issues?utf8=%E2%9C%93&q=+is%3Aclosed+milestone%3A7.1+>`_.
137 <https://github.com/ipython/ipython/issues?utf8=%E2%9C%93&q=+is%3Aclosed+milestone%3A7.1+>`_.
86
138
87 Unicode Completion update
139 Unicode Completion update
88 -------------------------
140 -------------------------
89
141
90 In IPython 7.1 the Unicode completion map has been updated and synchronized with
142 In IPython 7.1 the Unicode completion map has been updated and synchronized with
91 the Julia language.
143 the Julia language.
92
144
93 Added and removed character characters:
145 Added and removed character characters:
94
146
95 ``\jmath`` (``ȷ``), ``\\underleftrightarrow`` (U+034D, combining) have been
147 ``\jmath`` (``ȷ``), ``\\underleftrightarrow`` (U+034D, combining) have been
96 added, while ``\\textasciicaron`` have been removed
148 added, while ``\\textasciicaron`` have been removed
97
149
98 Some sequence have seen their prefix removed:
150 Some sequence have seen their prefix removed:
99
151
100 - 6 characters ``\text...<tab>`` should now be inputed with ``\...<tab>`` directly,
152 - 6 characters ``\text...<tab>`` should now be inputed with ``\...<tab>`` directly,
101 - 45 characters ``\Elz...<tab>`` should now be inputed with ``\...<tab>`` directly,
153 - 45 characters ``\Elz...<tab>`` should now be inputed with ``\...<tab>`` directly,
102 - 65 characters ``\B...<tab>`` should now be inputed with ``\...<tab>`` directly,
154 - 65 characters ``\B...<tab>`` should now be inputed with ``\...<tab>`` directly,
103 - 450 characters ``\m...<tab>`` should now be inputed with ``\...<tab>`` directly,
155 - 450 characters ``\m...<tab>`` should now be inputed with ``\...<tab>`` directly,
104
156
105 Some sequence have seen their prefix shortened:
157 Some sequence have seen their prefix shortened:
106
158
107 - 5 characters ``\mitBbb...<tab>`` should now be inputed with ``\bbi...<tab>`` directly,
159 - 5 characters ``\mitBbb...<tab>`` should now be inputed with ``\bbi...<tab>`` directly,
108 - 52 characters ``\mit...<tab>`` should now be inputed with ``\i...<tab>`` directly,
160 - 52 characters ``\mit...<tab>`` should now be inputed with ``\i...<tab>`` directly,
109 - 216 characters ``\mbfit...<tab>`` should now be inputed with ``\bi...<tab>`` directly,
161 - 216 characters ``\mbfit...<tab>`` should now be inputed with ``\bi...<tab>`` directly,
110 - 222 characters ``\mbf...<tab>`` should now be inputed with ``\b...<tab>`` directly,
162 - 222 characters ``\mbf...<tab>`` should now be inputed with ``\b...<tab>`` directly,
111
163
112 A couple of character had their sequence simplified:
164 A couple of character had their sequence simplified:
113
165
114 - ``ð``, type ``\dh<tab>``, instead of ``\eth<tab>``
166 - ``ð``, type ``\dh<tab>``, instead of ``\eth<tab>``
115 - ``ħ``, type ``\hbar<tab>``, instead of ``\Elzxh<tab>``
167 - ``ħ``, type ``\hbar<tab>``, instead of ``\Elzxh<tab>``
116 - ``ɸ``, type ``\ltphi<tab>``, instead of ``\textphi<tab>``
168 - ``ɸ``, type ``\ltphi<tab>``, instead of ``\textphi<tab>``
117 - ``ϴ``, type ``\varTheta<tab>``, instead of ``\textTheta<tab>``
169 - ``ϴ``, type ``\varTheta<tab>``, instead of ``\textTheta<tab>``
118 - ``ℇ``, type ``\eulermascheroni<tab>``, instead of ``\Eulerconst<tab>``
170 - ``ℇ``, type ``\eulermascheroni<tab>``, instead of ``\Eulerconst<tab>``
119 - ``ℎ``, type ``\planck<tab>``, instead of ``\Planckconst<tab>``
171 - ``ℎ``, type ``\planck<tab>``, instead of ``\Planckconst<tab>``
120
172
121 - U+0336 (COMBINING LONG STROKE OVERLAY), type ``\strike<tab>``, instead of ``\Elzbar<tab>``.
173 - U+0336 (COMBINING LONG STROKE OVERLAY), type ``\strike<tab>``, instead of ``\Elzbar<tab>``.
122
174
123 A couple of sequences have been updated:
175 A couple of sequences have been updated:
124
176
125 - ``\varepsilon`` now give ``ɛ`` (GREEK SMALL LETTER EPSILON) instead of ``ε`` (GREEK LUNATE EPSILON SYMBOL),
177 - ``\varepsilon`` now give ``ɛ`` (GREEK SMALL LETTER EPSILON) instead of ``ε`` (GREEK LUNATE EPSILON SYMBOL),
126 - ``\underbar`` now give U+0331 (COMBINING MACRON BELOW) instead of U+0332 (COMBINING LOW LINE).
178 - ``\underbar`` now give U+0331 (COMBINING MACRON BELOW) instead of U+0332 (COMBINING LOW LINE).
127
179
128
180
129 .. _whatsnew700:
181 .. _whatsnew700:
130
182
131 IPython 7.0.0
183 IPython 7.0.0
132 =============
184 =============
133
185
134 Released Thursday September 27th, 2018
186 Released Thursday September 27th, 2018
135
187
136 IPython 7 include major features improvement as you can read in the following
188 IPython 7 include major features improvement as you can read in the following
137 changelog. This is also the second major version of IPython to support only
189 changelog. This is also the second major version of IPython to support only
138 Python 3 – starting at Python 3.4. Python 2 is still community supported
190 Python 3 – starting at Python 3.4. Python 2 is still community supported
139 on the bugfix only 5.x branch, but we remind you that Python 2 "end of life"
191 on the bugfix only 5.x branch, but we remind you that Python 2 "end of life"
140 is on Jan 1st 2020.
192 is on Jan 1st 2020.
141
193
142 We were able to backport bug fixes to the 5.x branch thanks to our backport bot which
194 We were able to backport bug fixes to the 5.x branch thanks to our backport bot which
143 backported more than `70 Pull-Requests
195 backported more than `70 Pull-Requests
144 <https://github.com/ipython/ipython/pulls?page=3&q=is%3Apr+sort%3Aupdated-desc+author%3Aapp%2Fmeeseeksdev++5.x&utf8=%E2%9C%93>`_, but there are still many PRs that required manually work, and this is an area of the project were you can easily contribute by looking for `PRs still needed backport <https://github.com/ipython/ipython/issues?q=label%3A%22Still+Needs+Manual+Backport%22+is%3Aclosed+sort%3Aupdated-desc>`_
196 <https://github.com/ipython/ipython/pulls?page=3&q=is%3Apr+sort%3Aupdated-desc+author%3Aapp%2Fmeeseeksdev++5.x&utf8=%E2%9C%93>`_, but there are still many PRs that required manually work, and this is an area of the project were you can easily contribute by looking for `PRs still needed backport <https://github.com/ipython/ipython/issues?q=label%3A%22Still+Needs+Manual+Backport%22+is%3Aclosed+sort%3Aupdated-desc>`_
145
197
146 IPython 6.x branch will likely not see any further release unless critical
198 IPython 6.x branch will likely not see any further release unless critical
147 bugs are found.
199 bugs are found.
148
200
149 Make sure you have pip > 9.0 before upgrading. You should be able to update by simply running
201 Make sure you have pip > 9.0 before upgrading. You should be able to update by simply running
150
202
151 .. code::
203 .. code::
152
204
153 pip install ipython --upgrade
205 pip install ipython --upgrade
154
206
155 .. only:: ipydev
207 .. only:: ipydev
156
208
157 If you are trying to install or update an ``alpha``, ``beta``, or ``rc``
209 If you are trying to install or update an ``alpha``, ``beta``, or ``rc``
158 version, use pip ``--pre`` flag.
210 version, use pip ``--pre`` flag.
159
211
160 .. code::
212 .. code::
161
213
162 pip install ipython --upgrade --pre
214 pip install ipython --upgrade --pre
163
215
164
216
165 Or if you have conda installed:
217 Or if you have conda installed:
166
218
167 .. code::
219 .. code::
168
220
169 conda install ipython
221 conda install ipython
170
222
171
223
172
224
173 Prompt Toolkit 2.0
225 Prompt Toolkit 2.0
174 ------------------
226 ------------------
175
227
176 IPython 7.0+ now uses ``prompt_toolkit 2.0``, if you still need to use earlier
228 IPython 7.0+ now uses ``prompt_toolkit 2.0``, if you still need to use earlier
177 ``prompt_toolkit`` version you may need to pin IPython to ``<7.0``.
229 ``prompt_toolkit`` version you may need to pin IPython to ``<7.0``.
178
230
179 Autowait: Asynchronous REPL
231 Autowait: Asynchronous REPL
180 ---------------------------
232 ---------------------------
181
233
182 Staring with IPython 7.0 and on Python 3.6+, IPython can automatically await
234 Staring with IPython 7.0 and on Python 3.6+, IPython can automatically await
183 code at top level, you should not need to access an event loop or runner
235 code at top level, you should not need to access an event loop or runner
184 yourself. To know more read the :ref:`autoawait` section of our docs, see
236 yourself. To know more read the :ref:`autoawait` section of our docs, see
185 :ghpull:`11265` or try the following code::
237 :ghpull:`11265` or try the following code::
186
238
187 Python 3.6.0
239 Python 3.6.0
188 Type 'copyright', 'credits' or 'license' for more information
240 Type 'copyright', 'credits' or 'license' for more information
189 IPython 7.0.0 -- An enhanced Interactive Python. Type '?' for help.
241 IPython 7.0.0 -- An enhanced Interactive Python. Type '?' for help.
190
242
191 In [1]: import aiohttp
243 In [1]: import aiohttp
192 ...: result = aiohttp.get('https://api.github.com')
244 ...: result = aiohttp.get('https://api.github.com')
193
245
194 In [2]: response = await result
246 In [2]: response = await result
195 <pause for a few 100s ms>
247 <pause for a few 100s ms>
196
248
197 In [3]: await response.json()
249 In [3]: await response.json()
198 Out[3]:
250 Out[3]:
199 {'authorizations_url': 'https://api.github.com/authorizations',
251 {'authorizations_url': 'https://api.github.com/authorizations',
200 'code_search_url': 'https://api.github.com/search/code?q={query}{&page,per_page,sort,order}',
252 'code_search_url': 'https://api.github.com/search/code?q={query}{&page,per_page,sort,order}',
201 ...
253 ...
202 }
254 }
203
255
204 .. note::
256 .. note::
205
257
206 Async integration is experimental code, behavior may change or be removed
258 Async integration is experimental code, behavior may change or be removed
207 between Python and IPython versions without warnings.
259 between Python and IPython versions without warnings.
208
260
209 Integration is by default with `asyncio`, but other libraries can be configured,
261 Integration is by default with `asyncio`, but other libraries can be configured,
210 like ``curio`` or ``trio``, to improve concurrency in the REPL::
262 like ``curio`` or ``trio``, to improve concurrency in the REPL::
211
263
212 In [1]: %autoawait trio
264 In [1]: %autoawait trio
213
265
214 In [2]: import trio
266 In [2]: import trio
215
267
216 In [3]: async def child(i):
268 In [3]: async def child(i):
217 ...: print(" child %s goes to sleep"%i)
269 ...: print(" child %s goes to sleep"%i)
218 ...: await trio.sleep(2)
270 ...: await trio.sleep(2)
219 ...: print(" child %s wakes up"%i)
271 ...: print(" child %s wakes up"%i)
220
272
221 In [4]: print('parent start')
273 In [4]: print('parent start')
222 ...: async with trio.open_nursery() as n:
274 ...: async with trio.open_nursery() as n:
223 ...: for i in range(3):
275 ...: for i in range(3):
224 ...: n.spawn(child, i)
276 ...: n.spawn(child, i)
225 ...: print('parent end')
277 ...: print('parent end')
226 parent start
278 parent start
227 child 2 goes to sleep
279 child 2 goes to sleep
228 child 0 goes to sleep
280 child 0 goes to sleep
229 child 1 goes to sleep
281 child 1 goes to sleep
230 <about 2 seconds pause>
282 <about 2 seconds pause>
231 child 2 wakes up
283 child 2 wakes up
232 child 1 wakes up
284 child 1 wakes up
233 child 0 wakes up
285 child 0 wakes up
234 parent end
286 parent end
235
287
236 See :ref:`autoawait` for more information.
288 See :ref:`autoawait` for more information.
237
289
238
290
239 Asynchronous code in a Notebook interface or any other frontend using the
291 Asynchronous code in a Notebook interface or any other frontend using the
240 Jupyter Protocol will need further updates of the IPykernel package.
292 Jupyter Protocol will need further updates of the IPykernel package.
241
293
242 Non-Asynchronous code
294 Non-Asynchronous code
243 ~~~~~~~~~~~~~~~~~~~~~
295 ~~~~~~~~~~~~~~~~~~~~~
244
296
245 As the internal API of IPython is now asynchronous, IPython needs to run under
297 As the internal API of IPython is now asynchronous, IPython needs to run under
246 an event loop. In order to allow many workflows, (like using the :magic:`%run`
298 an event loop. In order to allow many workflows, (like using the :magic:`%run`
247 magic, or copy_pasting code that explicitly starts/stop event loop), when
299 magic, or copy_pasting code that explicitly starts/stop event loop), when
248 top-level code is detected as not being asynchronous, IPython code is advanced
300 top-level code is detected as not being asynchronous, IPython code is advanced
249 via a pseudo-synchronous runner, and may not advance pending tasks.
301 via a pseudo-synchronous runner, and may not advance pending tasks.
250
302
251 Change to Nested Embed
303 Change to Nested Embed
252 ~~~~~~~~~~~~~~~~~~~~~~
304 ~~~~~~~~~~~~~~~~~~~~~~
253
305
254 The introduction of the ability to run async code had some effect on the
306 The introduction of the ability to run async code had some effect on the
255 ``IPython.embed()`` API. By default embed will not allow you to run asynchronous
307 ``IPython.embed()`` API. By default embed will not allow you to run asynchronous
256 code unless a event loop is specified.
308 code unless a event loop is specified.
257
309
258 Effects on Magics
310 Effects on Magics
259 ~~~~~~~~~~~~~~~~~
311 ~~~~~~~~~~~~~~~~~
260
312
261 Some magics will not work with Async, and will need updates. Contribution
313 Some magics will not work with Async, and will need updates. Contribution
262 welcome.
314 welcome.
263
315
264 Expected Future changes
316 Expected Future changes
265 ~~~~~~~~~~~~~~~~~~~~~~~
317 ~~~~~~~~~~~~~~~~~~~~~~~
266
318
267 We expect more internal but public IPython function to become ``async``, and
319 We expect more internal but public IPython function to become ``async``, and
268 will likely end up having a persisting event loop while IPython is running.
320 will likely end up having a persisting event loop while IPython is running.
269
321
270 Thanks
322 Thanks
271 ~~~~~~
323 ~~~~~~
272
324
273 This took more than a year in the making, and the code was rebased a number of
325 This took more than a year in the making, and the code was rebased a number of
274 time leading to commit authorship that may have been lost in the final
326 time leading to commit authorship that may have been lost in the final
275 Pull-Request. Huge thanks to many people for contribution, discussion, code,
327 Pull-Request. Huge thanks to many people for contribution, discussion, code,
276 documentation, use-case: dalejung, danielballan, ellisonbg, fperez, gnestor,
328 documentation, use-case: dalejung, danielballan, ellisonbg, fperez, gnestor,
277 minrk, njsmith, pganssle, tacaswell, takluyver , vidartf ... And many others.
329 minrk, njsmith, pganssle, tacaswell, takluyver , vidartf ... And many others.
278
330
279
331
280 Autoreload Improvement
332 Autoreload Improvement
281 ----------------------
333 ----------------------
282
334
283 The magic :magic:`%autoreload 2 <autoreload>` now captures new methods added to
335 The magic :magic:`%autoreload 2 <autoreload>` now captures new methods added to
284 classes. Earlier, only methods existing as of the initial import were being
336 classes. Earlier, only methods existing as of the initial import were being
285 tracked and updated.
337 tracked and updated.
286
338
287 This new feature helps dual environment development - Jupyter+IDE - where the
339 This new feature helps dual environment development - Jupyter+IDE - where the
288 code gradually moves from notebook cells to package files, as it gets
340 code gradually moves from notebook cells to package files, as it gets
289 structured.
341 structured.
290
342
291 **Example**: An instance of the class ``MyClass`` will be able to access the
343 **Example**: An instance of the class ``MyClass`` will be able to access the
292 method ``cube()`` after it is uncommented and the file ``file1.py`` saved on
344 method ``cube()`` after it is uncommented and the file ``file1.py`` saved on
293 disk.
345 disk.
294
346
295
347
296 .. code::
348 .. code::
297
349
298 # notebook
350 # notebook
299
351
300 from mymodule import MyClass
352 from mymodule import MyClass
301 first = MyClass(5)
353 first = MyClass(5)
302
354
303 .. code::
355 .. code::
304
356
305 # mymodule/file1.py
357 # mymodule/file1.py
306
358
307 class MyClass:
359 class MyClass:
308
360
309 def __init__(self, a=10):
361 def __init__(self, a=10):
310 self.a = a
362 self.a = a
311
363
312 def square(self):
364 def square(self):
313 print('compute square')
365 print('compute square')
314 return self.a*self.a
366 return self.a*self.a
315
367
316 # def cube(self):
368 # def cube(self):
317 # print('compute cube')
369 # print('compute cube')
318 # return self.a*self.a*self.a
370 # return self.a*self.a*self.a
319
371
320
372
321
373
322
374
323 Misc
375 Misc
324 ----
376 ----
325
377
326 The autoindent feature that was deprecated in 5.x was re-enabled and
378 The autoindent feature that was deprecated in 5.x was re-enabled and
327 un-deprecated in :ghpull:`11257`
379 un-deprecated in :ghpull:`11257`
328
380
329 Make :magic:`%run -n -i ... <run>` work correctly. Earlier, if :magic:`%run` was
381 Make :magic:`%run -n -i ... <run>` work correctly. Earlier, if :magic:`%run` was
330 passed both arguments, ``-n`` would be silently ignored. See :ghpull:`10308`
382 passed both arguments, ``-n`` would be silently ignored. See :ghpull:`10308`
331
383
332
384
333 The :cellmagic:`%%script` (as well as :cellmagic:`%%bash`,
385 The :cellmagic:`%%script` (as well as :cellmagic:`%%bash`,
334 :cellmagic:`%%ruby`... ) cell magics now raise by default if the return code of
386 :cellmagic:`%%ruby`... ) cell magics now raise by default if the return code of
335 the given code is non-zero (thus halting execution of further cells in a
387 the given code is non-zero (thus halting execution of further cells in a
336 notebook). The behavior can be disable by passing the ``--no-raise-error`` flag.
388 notebook). The behavior can be disable by passing the ``--no-raise-error`` flag.
337
389
338
390
339 Deprecations
391 Deprecations
340 ------------
392 ------------
341
393
342 A couple of unused function and methods have been deprecated and will be removed
394 A couple of unused function and methods have been deprecated and will be removed
343 in future versions:
395 in future versions:
344
396
345 - ``IPython.utils.io.raw_print_err``
397 - ``IPython.utils.io.raw_print_err``
346 - ``IPython.utils.io.raw_print``
398 - ``IPython.utils.io.raw_print``
347
399
348
400
349 Backwards incompatible changes
401 Backwards incompatible changes
350 ------------------------------
402 ------------------------------
351
403
352 * The API for transforming input before it is parsed as Python code has been
404 * The API for transforming input before it is parsed as Python code has been
353 completely redesigned, and any custom input transformations will need to be
405 completely redesigned, and any custom input transformations will need to be
354 rewritten. See :doc:`/config/inputtransforms` for details of the new API.
406 rewritten. See :doc:`/config/inputtransforms` for details of the new API.
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now