Index: mhlib.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/mhlib.py,v retrieving revision 1.26 diff -c -r1.26 mhlib.py *** mhlib.py 2001/02/10 00:11:08 1.26 --- mhlib.py 2001/04/17 15:23:10 *************** *** 527,536 **** tosequences = self.getsequences() changed = 0 for name, seq in fromsequences.items(): ! try: toseq = tosequences[name] new = 0 ! except: toseq = [] new = 1 for fromn, ton in refileditems: --- 527,536 ---- tosequences = self.getsequences() changed = 0 for name, seq in fromsequences.items(): ! if tosequences.has_key(name): toseq = tosequences[name] new = 0 ! else: toseq = [] new = 1 for fromn, ton in refileditems: Index: inspect.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/inspect.py,v retrieving revision 1.16 diff -c -r1.16 inspect.py *** inspect.py 2001/04/13 14:04:02 1.16 --- inspect.py 2001/04/17 15:23:12 *************** *** 644,650 **** """Return the frame object for the caller's stack frame.""" try: raise 'catch me' ! except: return sys.exc_traceback.tb_frame.f_back if hasattr(sys, '_getframe'): currentframe = sys._getframe --- 644,650 ---- """Return the frame object for the caller's stack frame.""" try: raise 'catch me' ! except 'catch me': return sys.exc_traceback.tb_frame.f_back if hasattr(sys, '_getframe'): currentframe = sys._getframe