[Spambayes-checkins] spambayes pop3proxy.py,1.49,1.50

[Richie Hindle]

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

Modified Files:
	pop3proxy.py 
Log Message:
Correctly escape clues as they're written into the HTML, to
avoid XML parser errors.


Index: pop3proxy.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/pop3proxy.py,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** pop3proxy.py	31 Jan 2003 18:29:48 -0000	1.49
--- pop3proxy.py	31 Jan 2003 19:13:41 -0000	1.50
***************
*** 979,983 ****
          del cluesTable.cluesRow   # Delete dummy row to make way for real ones
          for word, wordProb in clues:
!             cluesTable += cluesRow % (word, wordProb)
  
          results = self.html.classifyResults.clone()
--- 979,983 ----
          del cluesTable.cluesRow   # Delete dummy row to make way for real ones
          for word, wordProb in clues:
!             cluesTable += cluesRow % (cgi.escape(word), wordProb)
  
          results = self.html.classifyResults.clone()
***************
*** 998,1006 ****
              stats.spamprob = state.bayes.probability(wordinfo)
          else:
!             stats = "%r does not exist in the database." % word
  
          query = self.html.wordQuery.clone()
          query.word.value = word
!         statsBox = self._buildBox("Statistics for %r" % word,
                                    'status.gif', stats)
          queryBox = self._buildBox("Word query", 'query.gif', query)
--- 998,1006 ----
              stats.spamprob = state.bayes.probability(wordinfo)
          else:
!             stats = "%r does not exist in the database." % cgi.escape(word)
  
          query = self.html.wordQuery.clone()
          query.word.value = word
!         statsBox = self._buildBox("Statistics for %r" % cgi.escape(word),
                                    'status.gif', stats)
          queryBox = self._buildBox("Word query", 'query.gif', query)