diff options
| author | Barry Warsaw <barry@python.org> | 2013-11-22 16:08:25 (GMT) |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2013-11-22 16:08:25 (GMT) |
| commit | 9e6097ebe7bb99a4a22b949ef4b1563b21ad7166 (patch) | |
| tree | e51d885f796058f800d6b1a5179e782a9f2617e7 /Doc | |
| parent | 87b9637a86876f86302a659da3b2e52a5cae5314 (diff) | |
| parent | 5398e1a56e4483a16e4620758aad0d91e986653f (diff) | |
| download | cpython-9e6097ebe7bb99a4a22b949ef4b1563b21ad7166.zip cpython-9e6097ebe7bb99a4a22b949ef4b1563b21ad7166.tar.gz cpython-9e6097ebe7bb99a4a22b949ef4b1563b21ad7166.tar.bz2 | |
Trunk merge.
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/dis.rst | 12 | ||||
| -rw-r--r-- | Doc/whatsnew/3.4.rst | 3 |
2 files changed, 13 insertions, 2 deletions
diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst index 78ddf7e..2365f0a 100644 --- a/Doc/library/dis.rst +++ b/Doc/library/dis.rst @@ -44,7 +44,7 @@ The bytecode analysis API allows pieces of Python code to be wrapped in a :class:`Bytecode` object that provides easy access to details of the compiled code. -.. class:: Bytecode(x, *, first_line=None) +.. class:: Bytecode(x, *, first_line=None, current_offset=None) Analyse the bytecode corresponding to a function, method, string of source code, or a code object (as returned by :func:`compile`). @@ -59,6 +59,16 @@ compiled code. Otherwise, the source line information (if any) is taken directly from the disassembled code object. + If *current_offset* is not None, it refers to an instruction offset + in the disassembled code. Setting this means :meth:`dis` will display + a "current instruction" marker against the specified opcode. + + .. classmethod:: from_traceback(tb) + + Construct a :class:`Bytecode` instance from the given traceback, + setting *current_offset* to the instruction responsible for the + exception. + .. data:: codeobj The compiled code object. diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst index 22d168e..6db3d63 100644 --- a/Doc/whatsnew/3.4.rst +++ b/Doc/whatsnew/3.4.rst @@ -385,7 +385,8 @@ The new :class:`dis.Bytecode` class provides an object-oriented API for inspecting bytecode, both in human-readable form and for iterating over instructions. -(Contributed by Nick Coghlan, Ryan Kelly and Thomas Kluyver in :issue:`11816`) +(Contributed by Nick Coghlan, Ryan Kelly and Thomas Kluyver in :issue:`11816` +and Claudiu Popa in :issue:`17916`) doctest |