[Spambayes-checkins] spambayes/Outlook2000 tester.py,1.6,1.7

[Mark Hammond]

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

Modified Files:
	tester.py 
Log Message:
Allow test suite to work with bsddb3 or bsddb

Index: tester.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/tester.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tester.py	20 Mar 2003 12:07:59 -0000	1.6
--- tester.py	3 May 2003 13:15:27 -0000	1.7
***************
*** 38,42 ****
  
  def DBExtractor(bayes):
!     import bsddb
      key = bayes.dbm.first()[0]
      if key not in ["saved state"]:
--- 38,48 ----
  
  def DBExtractor(bayes):
!     # We use bsddb3 now if we can
!     try:
!         import bsddb3 as bsddb
!         bsddb_error = bsddb.DBNotFoundError
!     except ImportError:
!         import bsddb
!         bsddb_error = bsddb.error
      key = bayes.dbm.first()[0]
      if key not in ["saved state"]:
***************
*** 46,49 ****
--- 52,57 ----
              key = bayes.dbm.next()[0]
          except bsddb.error:
+             break
+         except bsddb_error:
              break
          if key not in ["saved state"]: