[Spambayes-checkins] spambayes dbdict.py,1.2,1.3 hammiebulk.py,1.3,1.4

[Neale Pickett]

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

Modified Files:
	dbdict.py hammiebulk.py 
Log Message:
* s/dbhash/anydbm/


Index: dbdict.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/dbdict.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dbdict.py	25 Nov 2002 02:29:44 -0000	1.2
--- dbdict.py	25 Nov 2002 16:24:26 -0000	1.3
***************
*** 1,11 ****
  #! /usr/bin/env python
  
! """DBDict.py - Dictionary access to dbhash
  
  Classes:
!     DBDict - wraps a dbhash file
  
  Abstract:
!     DBDict class wraps a dbhash file with a reasonably complete set
      of dictionary access methods.  DBDicts can be iterated like a dictionary.
      
--- 1,11 ----
  #! /usr/bin/env python
  
! """DBDict.py - Dictionary access to anydbm
  
  Classes:
!     DBDict - wraps an anydbm file
  
  Abstract:
!     DBDict class wraps an anydbm file with a reasonably complete set
      of dictionary access methods.  DBDicts can be iterated like a dictionary.
      
***************
*** 57,61 ****
      import pickle
  
! import dbhash
  import errno
  import copy
--- 57,61 ----
      import pickle
  
! import anydbm
  import errno
  import copy
***************
*** 72,76 ****
      """Database Dictionary.
  
!     This wraps a dbhash database to make it look even more like a
      dictionary, much like the built-in shelf class.  The difference is
      that a DBDict supports all dict methods.
--- 72,76 ----
      """Database Dictionary.
  
!     This wraps an anydbm database to make it look even more like a
      dictionary, much like the built-in shelf class.  The difference is
      that a DBDict supports all dict methods.
***************
*** 92,96 ****
  
      def __init__(self, dbname, mode, wclass, iterskip=()):
!         self.hash = dbhash.open(dbname, mode)
          if not iterskip:
              self.iterskip = iterskip
--- 92,96 ----
  
      def __init__(self, dbname, mode, wclass, iterskip=()):
!         self.hash = anydbm.open(dbname, mode)
          if not iterskip:
              self.iterskip = iterskip

Index: hammiebulk.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/hammiebulk.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** hammiebulk.py	25 Nov 2002 06:22:26 -0000	1.3
--- hammiebulk.py	25 Nov 2002 16:24:26 -0000	1.4
***************
*** 46,50 ****
  import email
  import errno
- import anydbm
  import cPickle as pickle
  
--- 46,49 ----