Index: htmllib.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/htmllib.py,v retrieving revision 1.17 diff -c -r1.17 htmllib.py *** htmllib.py 2001/02/09 08:21:17 1.17 --- htmllib.py 2001/04/22 14:44:10 *************** *** 362,371 **** src = value if attrname == 'width': try: width = int(value) ! except: pass if attrname == 'height': try: height = int(value) ! except: pass self.handle_image(src, alt, ismap, align, width, height) # --- Really Old Unofficial Deprecated Stuff --- 362,371 ---- src = value if attrname == 'width': try: width = int(value) ! except ValueError: pass if attrname == 'height': try: height = int(value) ! except ValueError: pass self.handle_image(src, alt, ismap, align, width, height) # --- Really Old Unofficial Deprecated Stuff Index: anydbm.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/anydbm.py,v retrieving revision 1.10 diff -c -r1.10 anydbm.py *** anydbm.py 2001/02/18 03:30:53 1.10 --- anydbm.py 2001/04/22 14:44:10 *************** *** 42,52 **** """ ! try: ! class error(Exception): pass - except: - error = "anydbm.error" _names = ['dbhash', 'gdbm', 'dbm', 'dumbdbm'] _errors = [error] --- 42,49 ---- """ ! class error(Exception): pass _names = ['dbhash', 'gdbm', 'dbm', 'dumbdbm'] _errors = [error] Index: zipfile.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/zipfile.py,v retrieving revision 1.13 diff -c -r1.13 zipfile.py *** zipfile.py 2001/04/14 16:45:14 1.13 --- zipfile.py 2001/04/22 14:44:12 *************** *** 296,302 **** for zinfo in self.filelist: try: self.read(zinfo.filename) # Check CRC-32 ! except: return zinfo.filename def getinfo(self, name): --- 296,302 ---- for zinfo in self.filelist: try: self.read(zinfo.filename) # Check CRC-32 ! except BadZipfile: return zinfo.filename def getinfo(self, name): Index: fileinput.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/fileinput.py,v retrieving revision 1.7 diff -c -r1.7 fileinput.py *** fileinput.py 2001/01/20 23:34:12 1.7 --- fileinput.py 2001/04/22 14:44:13 *************** *** 203,209 **** self._backupfilename = 0 if backupfilename and not self._backup: try: os.unlink(backupfilename) ! except: pass self._isstdin = 0 self._buffer = [] --- 203,209 ---- self._backupfilename = 0 if backupfilename and not self._backup: try: os.unlink(backupfilename) ! except OSError: pass self._isstdin = 0 self._buffer = [] *************** *** 237,243 **** self._backupfilename = ( self._filename + (self._backup or ".bak")) try: os.unlink(self._backupfilename) ! except os.error: pass # The next few lines may raise IOError os.rename(self._filename, self._backupfilename) self._file = open(self._backupfilename, "r") --- 237,243 ---- self._backupfilename = ( self._filename + (self._backup or ".bak")) try: os.unlink(self._backupfilename) ! except OSError: pass # The next few lines may raise IOError os.rename(self._filename, self._backupfilename) self._file = open(self._backupfilename, "r")