[Spambayes-checkins] spambayes/Outlook2000 manager.py,1.43,1.44
Mark Hammond
mhammond at users.sourceforge.net
Fri Feb 7 03:23:37 EST 2003
Update of /cvsroot/spambayes/spambayes/Outlook2000
In directory sc8-pr-cvs1:/tmp/cvs-serv14114
Modified Files:
manager.py
Log Message:
Paul Moore found some errors using bsddb3.
Index: manager.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/manager.py,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** manager.py 5 Feb 2003 03:09:42 -0000 1.43
--- manager.py 7 Feb 2003 11:23:34 -0000 1.44
***************
*** 38,47 ****
# on Windows, so we don't use that)
try:
! from bsddb import db # This name doesn't exist in the old one.
! use_db = True
except ImportError:
# See if the explicit bsddb3 module exists.
try:
! import bsddb3
use_db = True
except ImportError:
--- 38,47 ----
# on Windows, so we don't use that)
try:
! import bsddb
! use_db = hasattr(bsddb, "db") # This name doesn't exist in the old one.
except ImportError:
# See if the explicit bsddb3 module exists.
try:
! import bsddb3 as bsddb
use_db = True
except ImportError:
***************
*** 117,129 ****
bayes.dbm.close()
def open_mdb(self):
- try:
- import bsddb
- except ImportError:
- import bsddb3 as bsddb
return bsddb.hashopen(self.mdb_filename)
def new_mdb(self):
try:
os.unlink(self.mdb_filename)
! except IOError, e:
if e.errno != errno.ENOENT: raise
return self.open_mdb()
--- 117,125 ----
bayes.dbm.close()
def open_mdb(self):
return bsddb.hashopen(self.mdb_filename)
def new_mdb(self):
try:
os.unlink(self.mdb_filename)
! except EnvironmentError, e:
if e.errno != errno.ENOENT: raise
return self.open_mdb()
More information about the Spambayes-checkins
mailing list