diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-08-17 12:53:55 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-08-17 12:53:55 (GMT) |
| commit | 9a3777e525b389ec5881c3f80a482fb821ab3ea5 (patch) | |
| tree | e83520348eea751f2b02e8effa76f3cce2c644cd /Lib/pickletools.py | |
| parent | 07351a044960f259c8730de3f81356fbcdbe2bbf (diff) | |
| parent | 30b9d5d3af043fc2687ad11a188a34fe355e20ef (diff) | |
| download | cpython-9a3777e525b389ec5881c3f80a482fb821ab3ea5.zip cpython-9a3777e525b389ec5881c3f80a482fb821ab3ea5.tar.gz cpython-9a3777e525b389ec5881c3f80a482fb821ab3ea5.tar.bz2 | |
#18705: merge with 3.3.
Diffstat (limited to 'Lib/pickletools.py')
| -rw-r--r-- | Lib/pickletools.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/pickletools.py b/Lib/pickletools.py index 386a95c..f54b902 100644 --- a/Lib/pickletools.py +++ b/Lib/pickletools.py @@ -887,7 +887,7 @@ stackslice = StackObject( obtype=StackObject, doc="""An object representing a contiguous slice of the stack. - This is used in conjuction with markobject, to represent all + This is used in conjunction with markobject, to represent all of the stack following the topmost markobject. For example, the POP_MARK opcode changes the stack from @@ -2037,12 +2037,12 @@ def dis(pickle, out=None, memo=None, indentlevel=4, annotate=0): stack = [] # crude emulation of unpickler stack if memo is None: - memo = {} # crude emulation of unpicker memo + memo = {} # crude emulation of unpickler memo maxproto = -1 # max protocol number seen markstack = [] # bytecode positions of MARK opcodes indentchunk = ' ' * indentlevel errormsg = None - annocol = annotate # columnt hint for annotations + annocol = annotate # column hint for annotations for opcode, arg, pos in genops(pickle): if pos is not None: print("%5d:" % pos, end=' ', file=out) |