[Spambayes-checkins] spambayes/spambayes storage.py,1.12,1.13

[Tim Peters]

Update of /cvsroot/spambayes/spambayes/spambayes
In directory sc8-pr-cvs1:/tmp/cvs-serv22576/spambayes

Modified Files:
	storage.py 
Log Message:
store():  If a Shelf db doesn't have a key, then "del db[key]" should
raise KeyError.


Index: storage.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/storage.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** storage.py	27 Jun 2003 00:43:22 -0000	1.12
--- storage.py	27 Jun 2003 00:45:21 -0000	1.13
***************
*** 193,201 ****
                         "Should not have a wordinfo for words flagged for delete"
                  # Word may be deleted before it was ever written.
!                 # hrmph - working out what exceptions would be reasonable is
!                 # a PITA (but anydbm.errors may be useful) - but for now,
!                 # just check the key first.
!                 if self.db.has_key(key):
                      del self.db[key]
              else:
                  raise RuntimeError, "Unknown flag value"
--- 193,200 ----
                         "Should not have a wordinfo for words flagged for delete"
                  # Word may be deleted before it was ever written.
!                 try:
                      del self.db[key]
+                 except KeyError:
+                     pass
              else:
                  raise RuntimeError, "Unknown flag value"