summaryrefslogtreecommitdiff
path: root/Lib/pickle.py
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2012-03-06 15:33:24 -0500
committerBrett Cannon <brett@python.org>2012-03-06 15:33:24 -0500
commitf67e494ca8dfc72c0f812ed46c6a08ad3b9ddc24 (patch)
treeceed84488164142e5884411566de19f66702c3e7 /Lib/pickle.py
parent0d4d410b2d6891520b1772a85f5ebdf926a0c77e (diff)
parent0119e4753eec50f671ee716af202b4a1ca28deef (diff)
downloadcpython-git-f67e494ca8dfc72c0f812ed46c6a08ad3b9ddc24.tar.gz
merge
Diffstat (limited to 'Lib/pickle.py')
-rw-r--r--Lib/pickle.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/pickle.py b/Lib/pickle.py
index c01a6af807..20b3646a5b 100644
--- a/Lib/pickle.py
+++ b/Lib/pickle.py
@@ -297,8 +297,8 @@ class _Pickler:
f(self, obj) # Call unbound method with explicit self
return
- # Check copyreg.dispatch_table
- reduce = dispatch_table.get(t)
+ # Check private dispatch table if any, or else copyreg.dispatch_table
+ reduce = getattr(self, 'dispatch_table', dispatch_table).get(t)
if reduce:
rv = reduce(obj)
else: