diff options
author | Benjamin Peterson <benjamin@python.org> | 2009-01-01 15:05:06 +0000 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2009-01-01 15:05:06 +0000 |
commit | 75edad0502c648148c6139b2d81a128559573c0d (patch) | |
tree | fe8dc37189c0d6b147fa7a9a02c75cf1e969a602 /Lib/dis.py | |
parent | da10d3b7a5b4c3be5b3bbf0c4cfcd18110a0decd (diff) | |
download | cpython-git-75edad0502c648148c6139b2d81a128559573c0d.tar.gz |
Merged revisions 68116-68119,68121,68123-68127 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68116 | georg.brandl | 2009-01-01 05:46:51 -0600 (Thu, 01 Jan 2009) | 2 lines
#4100: note that element children are not necessarily present on "start" events.
........
r68117 | georg.brandl | 2009-01-01 05:53:55 -0600 (Thu, 01 Jan 2009) | 2 lines
#4156: make clear that "protocol" is to be replaced with the protocol name.
........
r68118 | georg.brandl | 2009-01-01 06:00:19 -0600 (Thu, 01 Jan 2009) | 2 lines
#4185: clarify escape behavior of replacement strings.
........
r68119 | georg.brandl | 2009-01-01 06:09:40 -0600 (Thu, 01 Jan 2009) | 3 lines
#4222: document dis.findlabels() and dis.findlinestarts() and
put them into dis.__all__.
........
r68121 | georg.brandl | 2009-01-01 06:43:33 -0600 (Thu, 01 Jan 2009) | 2 lines
Point to types module in new module deprecation notice.
........
r68123 | georg.brandl | 2009-01-01 06:52:29 -0600 (Thu, 01 Jan 2009) | 2 lines
#4784: ... on three counts ...
........
r68124 | georg.brandl | 2009-01-01 06:53:19 -0600 (Thu, 01 Jan 2009) | 2 lines
#4782: Fix markup error that hid load() and loads().
........
r68125 | georg.brandl | 2009-01-01 07:02:09 -0600 (Thu, 01 Jan 2009) | 2 lines
#4776: add data_files and package_dir arguments.
........
r68126 | georg.brandl | 2009-01-01 07:05:13 -0600 (Thu, 01 Jan 2009) | 2 lines
Handlers are in the `logging.handlers` module.
........
r68127 | georg.brandl | 2009-01-01 07:14:49 -0600 (Thu, 01 Jan 2009) | 2 lines
#4767: Use correct submodules for all MIME classes.
........
Diffstat (limited to 'Lib/dis.py')
-rw-r--r-- | Lib/dis.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/dis.py b/Lib/dis.py index c98f0c0a8d..2b400dc88f 100644 --- 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): |