[Python-checkins] CVS: python/dist/src/Mac/Tools/IDE MacPrefs.py,1.2,1.3

[Just van Rossum]

Update of /cvsroot/python/python/dist/src/Mac/Tools/IDE
In directory usw-pr-cvs1:/tmp/cvs-serv26400

Modified Files:
	MacPrefs.py 
Log Message:
don't crash when encountering bad marshal data

Index: MacPrefs.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Tools/IDE/MacPrefs.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** MacPrefs.py	2001/03/15 14:33:24	1.2
--- MacPrefs.py	2001/07/05 07:03:16	1.3
***************
*** 51,55 ****
  		try:
  			prefdict = marshal.load(open(self.__path, 'rb'))
! 		except IOError:
  			pass
  		else:
--- 51,56 ----
  		try:
  			prefdict = marshal.load(open(self.__path, 'rb'))
! 		except (IOError, ValueError):
! 			# file not found, or currupt marshal data
  			pass
  		else: