summaryrefslogtreecommitdiff
path: root/Lib/pickletools.py
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-08-17 15:50:46 +0300
committerEzio Melotti <ezio.melotti@gmail.com>2013-08-17 15:50:46 +0300
commit30b9d5d3af043fc2687ad11a188a34fe355e20ef (patch)
tree6e86b6b605397d826721779611ebd06d028acfc1 /Lib/pickletools.py
parent67f39777fa2c14f0e632adda8c5945cec569b46e (diff)
downloadcpython-git-30b9d5d3af043fc2687ad11a188a34fe355e20ef.tar.gz
#18705: fix a number of typos. Patch by FĂ©vry Thibault.
Diffstat (limited to 'Lib/pickletools.py')
-rw-r--r--Lib/pickletools.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/pickletools.py b/Lib/pickletools.py
index 69cedf7731..7351c8d290 100644
--- a/Lib/pickletools.py
+++ b/Lib/pickletools.py
@@ -888,7 +888,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
@@ -2038,12 +2038,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)