[Python-checkins] python/dist/src/Lib pickle.py,1.144,1.145

[jhylton@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1:/tmp/cvs-serv31570

Modified Files:
	pickle.py 
Log Message:
Replace hasattr() + getattr() with single getattr() and default value.


Index: pickle.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/pickle.py,v
retrieving revision 1.144
retrieving revision 1.145
diff -C2 -d -r1.144 -r1.145
*** pickle.py	4 Feb 2003 01:54:48 -0000	1.144
--- pickle.py	6 Feb 2003 16:22:01 -0000	1.145
***************
*** 944,949 ****
              continue # skip dummy package entries
          if name != '__main__' and \
!             hasattr(module, funcname) and \
!             getattr(module, funcname) is func:
              break
      else:
--- 944,948 ----
              continue # skip dummy package entries
          if name != '__main__' and \
!             getattr(module, funcname, None) is func:
              break
      else: