summaryrefslogtreecommitdiff
path: root/Lib/pickletools.py
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-08-17 15:43:51 +0300
committerEzio Melotti <ezio.melotti@gmail.com>2013-08-17 15:43:51 +0300
commitf5469cff1f90381819291bcddcc70f5aaf2da141 (patch)
treef61191eac7db34346674d3b5dca6cfc334dcca99 /Lib/pickletools.py
parent10b513098af5323bc2e9dee4775531eb63c1f0ab (diff)
downloadcpython-git-f5469cff1f90381819291bcddcc70f5aaf2da141.tar.gz
#18705: fix a number of typos. Patch by FĂ©vry Thibault.
Diffstat (limited to 'Lib/pickletools.py')
-rw-r--r--Lib/pickletools.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/pickletools.py b/Lib/pickletools.py
index d717728d41..8de53dd250 100644
--- a/Lib/pickletools.py
+++ b/Lib/pickletools.py
@@ -804,7 +804,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
@@ -1929,7 +1929,7 @@ def dis(pickle, out=None, memo=None, indentlevel=4):
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