Replace hasattr() + getattr() with single getattr() and default value.

diff --git a/Lib/pickle.py b/Lib/pickle.py
index 35ab91b91436e33f780ab1aeb2f8f189270dd81b..876c81b70a1e9aafa0398e668641de428d965772 100644 (file)
--- 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__'