[Spambayes-checkins] spambayes neilfilter.py,1.4,1.5

[Neil Schemenauer]

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

Modified Files:
	neilfilter.py 
Log Message:
Repair to work with new Classifer interface.


Index: neilfilter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/neilfilter.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** neilfilter.py	2 Oct 2002 16:05:27 -0000	1.4
--- neilfilter.py	25 Nov 2002 18:13:40 -0000	1.5
***************
*** 20,37 ****
  SPAM_CUTOFF = 0.57
  
! class CdbWrapper(cdb.Cdb):
!     def get(self, key, default=None,
!             cdb_get=cdb.Cdb.get,
!             WordInfo=classifier.WordInfo):
!         prob = cdb_get(self, key, default)
!         if prob is None:
!             return None
!         else:
!             return WordInfo(0, float(prob))
! 
! class CdbBayes(classifier.Bayes):
      def __init__(self, cdbfile):
          classifier.Bayes.__init__(self)
!         self.wordinfo = CdbWrapper(cdbfile)
  
  def maketmp(dir):
--- 20,30 ----
  SPAM_CUTOFF = 0.57
  
! class CdbClassifer(classifier.Classifier):
      def __init__(self, cdbfile):
          classifier.Bayes.__init__(self)
!         self.wordinfo = cdb.Cdb(cdbfile)
! 
!     def probability(self, record):
!         return float(record)
  
  def maketmp(dir):
***************
*** 94,98 ****
              msg = email.message_from_string(msgdata)
              del msgdata
!             bayes = CdbBayes(open(wordprobfilename, 'rb'))
              prob = bayes.spamprob(tokenize(msg))
          else:
--- 87,91 ----
              msg = email.message_from_string(msgdata)
              del msgdata
!             bayes = CdbClassifer(open(wordprobfilename, 'rb'))
              prob = bayes.spamprob(tokenize(msg))
          else: