[Spambayes-checkins] spambayes/spambayes dbmstorage.py,1.11,1.12

[Kenny Pitt]

Update of /cvsroot/spambayes/spambayes/spambayes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26748

Modified Files:
	dbmstorage.py 
Log Message:
Apparently the default Python installation on NetBSD does not include the
bsddb package, so maybe there are others that have the same issue.  Since
bsddb is the same as bsddb3 on any recent Python (2.3+), try using bsddb3
instead if we are unable to import bsddb.


Index: dbmstorage.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/dbmstorage.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** dbmstorage.py	16 Dec 2003 05:06:34 -0000	1.11
--- dbmstorage.py	7 Jan 2005 19:58:37 -0000	1.12
***************
*** 17,21 ****
      """Open a bsddb hash.  Don't use this on Windows, unless Python 2.3 or
      greater is used, in which case bsddb3 is actually named bsddb."""
!     import bsddb
      return bsddb.hashopen(*args)
  
--- 17,24 ----
      """Open a bsddb hash.  Don't use this on Windows, unless Python 2.3 or
      greater is used, in which case bsddb3 is actually named bsddb."""
!     try:
!         import bsddb
!     except ImportError:
!         import bsddb3 as bsddb
      return bsddb.hashopen(*args)