summaryrefslogtreecommitdiff
path: root/Lib/pickle.py
diff options
context:
space:
mode:
authorJeremy Hylton <jeremy@alum.mit.edu>2003-02-06 16:22:01 +0000
committerJeremy Hylton <jeremy@alum.mit.edu>2003-02-06 16:22:01 +0000
commit2716400fc155c4ec713ebcbdb578e01b62db2e49 (patch)
tree7e85165675214817968ca26c323a6e15832eed3e /Lib/pickle.py
parentec9ac2c3d764f67cd426e34006efce1483804ff5 (diff)
downloadcpython-2716400fc155c4ec713ebcbdb578e01b62db2e49.tar.gz
Replace hasattr() + getattr() with single getattr() and default value.
Diffstat (limited to 'Lib/pickle.py')
-rw-r--r--Lib/pickle.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/pickle.py b/Lib/pickle.py
index 35ab91b914..876c81b70a 100644
--- a/Lib/pickle.py
+++ b/Lib/pickle.py
@@ -943,8 +943,7 @@ def whichmodule(func, funcname):
if module is None:
continue # skip dummy package entries
if name != '__main__' and \
- hasattr(module, funcname) and \
- getattr(module, funcname) is func:
+ getattr(module, funcname, None) is func:
break
else:
name = '__main__'