Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 39 additions & 3 deletions Doc/library/pickletools.rst
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,47 @@ Programmatic interface
.. function:: genops(pickle)

Provides an :term:`iterator` over all of the opcodes in a pickle, returning a
sequence of ``(opcode, arg, pos)`` triples. *opcode* is an instance of an
:class:`OpcodeInfo` class; *arg* is the decoded value, as a Python object, of
the opcode's argument; *pos* is the position at which this opcode is located.
sequence of ``(opcode, arg, pos)`` triples. *opcode* is an instance of
:class:`OpcodeInfo`; *arg* is the decoded value, as a Python object, of the

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert the change moving "the" let's not have churn. Also we can remove the "an" before OpcodeInfo.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Docs WG monthly meeting triage: please move "the" back.

opcode's argument; *pos* is the position at which this opcode is located.
*pickle* can be a string or a file-like object.

.. class:: OpcodeInfo

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't in pickletools.__all__ so if we're documenting it we should add it there, and also ArgumentDescriptor and StackObject. They are technically already public per PEP 387, and we do return them, so I think we should expose them properly.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Docs WG monthly meeting triage: please either add these __all__ in to pickletools.py, or say why they don't need adding.


Represents information about a pickle opcode.

Instances of this class are returned as the first element of the tuples
yielded by :func:`genops`.

.. attribute:: name

The symbolic name of the opcode.

.. attribute:: code

The one-character opcode value.

.. attribute:: arg

The descriptor for the opcode argument, or ``None`` if the opcode has
no argument.

.. attribute:: stack_before

A list describing the stack before the opcode executes.

.. attribute:: stack_after

A list describing the stack after the opcode executes.

.. attribute:: proto

The pickle protocol version in which the opcode was introduced.

.. attribute:: doc

A human-readable description of the opcode.

.. function:: optimize(picklestring)

Returns a new equivalent pickle string after eliminating unused ``PUT``
Expand Down
1 change: 0 additions & 1 deletion Doc/tools/.nitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ Doc/library/lzma.rst
Doc/library/mmap.rst
Doc/library/multiprocessing.rst
Doc/library/optparse.rst
Doc/library/pickletools.rst
Doc/library/pyexpat.rst
Doc/library/select.rst
Doc/library/socket.rst
Expand Down
9 changes: 8 additions & 1 deletion Lib/pickletools.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,14 @@

lazy from _colorize import decolor, get_theme

__all__ = ['dis', 'genops', 'optimize']
__all__ = [
'dis',
'genops',
'optimize',
'ArgumentDescriptor',
'StackObject',
'OpcodeInfo',
]

bytes_types = pickle.bytes_types

Expand Down
5 changes: 2 additions & 3 deletions Lib/test/test_pickletools.py
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ def test__all__(self):
'bytes_types',
'UP_TO_NEWLINE', 'TAKEN_FROM_ARGUMENT1',
'TAKEN_FROM_ARGUMENT4', 'TAKEN_FROM_ARGUMENT4U',
'TAKEN_FROM_ARGUMENT8U', 'ArgumentDescriptor',
'TAKEN_FROM_ARGUMENT8U',
'read_uint1', 'read_uint2', 'read_int4', 'read_uint4',
'read_uint8', 'read_stringnl', 'read_stringnl_noescape',
'read_stringnl_noescape_pair', 'read_string1',
Expand All @@ -508,12 +508,11 @@ def test__all__(self):
'unicodestringnl', 'unicodestring1', 'unicodestring4',
'unicodestring8', 'decimalnl_short', 'decimalnl_long',
'floatnl', 'float8', 'long1', 'long4',
'StackObject',
'pyint', 'pylong', 'pyinteger_or_bool', 'pybool', 'pyfloat',
'pybytes_or_str', 'pystring', 'pybytes', 'pybytearray',
'pyunicode', 'pynone', 'pytuple', 'pylist', 'pydict',
'pyset', 'pyfrozenset', 'pybuffer', 'anyobject',
'markobject', 'stackslice', 'OpcodeInfo', 'opcodes',
'markobject', 'stackslice', 'opcodes',
'code2op',
}
support.check__all__(self, pickletools, not_exported=not_exported)
Expand Down
Loading