[Spambayes-checkins] spambayes/spambayes dbmstorage.py,1.16,1.17

[Skip Montanaro]

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

Modified Files:
	dbmstorage.py 
Log Message:
Revert the last change.  It was ill-considered, and only serves to sneak
Berkeley DB 1.85 files into the system on Macs in the guise of supporting
the dbm format.


Index: dbmstorage.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/dbmstorage.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** dbmstorage.py	3 Jul 2007 14:12:49 -0000	1.16
--- dbmstorage.py	4 Jul 2007 10:58:54 -0000	1.17
***************
*** 34,42 ****
      return gdbm.open(*args)
  
- def open_dbm(*args):
-     """Open a dbm database."""
-     import dbm
-     return dbm.open(*args)
-  
  def open_best(*args):
      if sys.platform == "win32":
--- 34,37 ----
***************
*** 47,52 ****
              funcs.insert(0, open_dbhash)
      else:
!         funcs = [open_db3hash, open_dbhash, open_gdbm, open_db185hash,
!                  open_dbm]
      for f in funcs:
          try:
--- 42,46 ----
              funcs.insert(0, open_dbhash)
      else:
!         funcs = [open_db3hash, open_dbhash, open_gdbm, open_db185hash]
      for f in funcs:
          try:
***************
*** 62,66 ****
      "bsddb185": open_db185hash,
      "gdbm": open_gdbm,
-     "dbm": open_dbm,
      }
  
--- 56,59 ----