[Spambayes-checkins] spambayes pop3proxy.py,1.31,1.32

[Richie Hindle]

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

Modified Files:
	pop3proxy.py 
Log Message:
Fixed the web interface's "Word query" form, which had been broken
by the Classifier abstraction work (my fault).


Index: pop3proxy.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/pop3proxy.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** pop3proxy.py	28 Nov 2002 22:02:46 -0000	1.31
--- pop3proxy.py	3 Dec 2002 21:22:22 -0000	1.32
***************
*** 101,104 ****
--- 101,105 ----
     Debugger into a library.
   o Cope with the email client timing out and closing the connection.
+  o Lose the trailing dot from cached messages.
  
  
***************
*** 1195,1200 ****
          word = params['word']
          word = word.lower()
!         try:
!             wi = state.bayes.wordinfo[word]
              members = wi.__dict__
              members['spamprob'] = state.bayes.probability(wi)
--- 1196,1201 ----
          word = params['word']
          word = word.lower()
!         wi = state.bayes._wordinfoget(word)
!         if wi:
              members = wi.__dict__
              members['spamprob'] = state.bayes.probability(wi)
***************
*** 1203,1207 ****
                     Probability that a message containing this word is spam:
                     <b>%(spamprob)f</b>.<br>""" % members
!         except KeyError:
              info = "%r does not appear in the database." % word
  
--- 1204,1208 ----
                     Probability that a message containing this word is spam:
                     <b>%(spamprob)f</b>.<br>""" % members
!         else:
              info = "%r does not appear in the database." % word