#4222: document dis.findlabels() and dis.findlinestarts() and

put them into dis.__all__.

diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
index e9cbb131ea9c3d4a48db206f9808100d6e1cfb9f..909e229ed10c861bc9236aa6092d720241a5de80 100644 (file)
--- a/Doc/library/dis.rst
+++ b/Doc/library/dis.rst
@@ -64,10 +64,23 @@ The :mod:`dis` module defines the following functions and constants:
 
 .. function:: disco(code[, lasti])
 
-   A synonym for disassemble.  It is more convenient to type, and kept for
-   compatibility with earlier Python releases.
+   A synonym for :func:`disassemble`.  It is more convenient to type, and kept
+   for compatibility with earlier Python releases.
 
 
+.. function:: findlinestarts(code)
+
+   This generator function uses the ``co_firstlineno`` and ``co_lnotab``
+   attributes of the code object *code* to find the offsets which are starts of
+   lines in the source code.  They are generated as ``(offset, lineno)`` pairs.
+
+
+.. function:: findlabels(code)
+
+   Detect all offsets in the code object *code* which are jump targets, and
+   return a list of these offsets.
+   
+   
 .. data:: opname
 
    Sequence of operation names, indexable using the bytecode.

diff --git a/Lib/dis.py b/Lib/dis.py
index 5a74b3ae894b7fb378973a772193c33ca298f1d2..e60e702036ca2c0677aa9fc729ce3214271ae55b 100644 (file)
--- a/Lib/dis.py
+++ b/Lib/dis.py
@@ -6,7 +6,8 @@ import types
 from opcode import *
 from opcode import __all__ as _opcodes_all
 
-__all__ = ["dis","disassemble","distb","disco"] + _opcodes_all
+__all__ = ["dis", "disassemble", "distb", "disco",
+           "findlinestarts", "findlabels"] + _opcodes_all
 del _opcodes_all
 
 def dis(x=None):