summaryrefslogtreecommitdiff
path: root/Lib/pickle.py
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2011-10-28 14:52:29 +0200
committerFlorent Xicluna <florent.xicluna@gmail.com>2011-10-28 14:52:29 +0200
commitaabbda5354407cfe35097c7f17717a716a3d80c4 (patch)
treee15e7fe42975e08e567879ec8a949d4986ca4493 /Lib/pickle.py
parentac73b0c95e352563ecf0a4643b30215b9bdee1a5 (diff)
parent5d1155c08edf7f53eca804b2b6538636c2dfe711 (diff)
downloadcpython-git-aabbda5354407cfe35097c7f17717a716a3d80c4.tar.gz
Merge 3.2
Diffstat (limited to 'Lib/pickle.py')
-rw-r--r--Lib/pickle.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/pickle.py b/Lib/pickle.py
index a5c8328c13..f6ff3808b8 100644
--- a/Lib/pickle.py
+++ b/Lib/pickle.py
@@ -362,7 +362,7 @@ class _Pickler:
raise PicklingError("args from save_reduce() should be a tuple")
# Assert that func is callable
- if not hasattr(func, '__call__'):
+ if not callable(func):
raise PicklingError("func from save_reduce() should be callable")
save = self.save