[Spambayes-checkins] spambayes/spambayes message.py,1.13,1.14

[Tim Stone]

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

Modified Files:
	message.py 
Log Message:
Corrected an incorrectly specified option

Index: message.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/message.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** message.py	19 Apr 2003 03:46:56 -0000	1.13
--- message.py	19 Apr 2003 04:13:44 -0000	1.14
***************
*** 197,205 ****
      def GetClassification(self):
          if self.c == 's':
!             return options['hammie','header_spam_string']
          if self.c == 'h':
!             return options['hammie','header_ham_string']
          if self.c == 'u':
!             return options['hammie','header_unsure_string']
  
          return None
--- 197,205 ----
      def GetClassification(self):
          if self.c == 's':
!             return options['Hammie','header_spam_string']
          if self.c == 'h':
!             return options['Hammie','header_ham_string']
          if self.c == 'u':
!             return options['Hammie','header_unsure_string']
  
          return None
***************
*** 209,217 ****
          # may change, which would really screw this database up
  
!         if cls == options['hammie','header_spam_string']:
              self.c = 's'
!         elif cls == options['hammie','header_ham_string']:
              self.c = 'h'
!         elif cls == options['hammie','header_unsure_string']:
              self.c = 'u'
          else:
--- 209,217 ----
          # may change, which would really screw this database up
  
!         if cls == options['Hammie','header_spam_string']:
              self.c = 's'
!         elif cls == options['Hammie','header_ham_string']:
              self.c = 'h'
!         elif cls == options['Hammie','header_unsure_string']:
              self.c = 'u'
          else:
***************
*** 258,269 ****
          add optional headers if needed.'''
          
!         if prob < options['hammie','ham_cutoff']:
!             disposition = options['hammie','header_ham_string']
!         elif prob > options['hammie','spam_cutoff']:
!             disposition = options['hammie','header_spam_string']
          else:
!             disposition = options['hammie','header_unsure_string']
          self.RememberClassification(disposition)
!         self[options['hammie','header_name']] = disposition
          
          if options['pop3proxy','include_prob']:
--- 258,269 ----
          add optional headers if needed.'''
          
!         if prob < options['Categorization','ham_cutoff']:
!             disposition = options['Hammie','header_ham_string']
!         elif prob > options['Categorization','spam_cutoff']:
!             disposition = options['Hammie','header_spam_string']
          else:
!             disposition = options['Hammie','header_unsure_string']
          self.RememberClassification(disposition)
!         self[options['Hammie','header_name']] = disposition
          
          if options['pop3proxy','include_prob']:
***************
*** 279,284 ****
               for word, score in clues
               if (word[0] == '*' or
!                  score <= options['hammie','clue_mailheader_cutoff'] or
!                  score >= 1.0 - options['hammie','clue_mailheader_cutoff'])])
              self[options['pop3proxy','evidence_header_name']] = evd
          
--- 279,284 ----
               for word, score in clues
               if (word[0] == '*' or
!                  score <= options['Hammie','clue_mailheader_cutoff'] or
!                  score >= 1.0 - options['Hammie','clue_mailheader_cutoff'])])
              self[options['pop3proxy','evidence_header_name']] = evd
          
***************
*** 294,300 ****
  
      def delSBHeaders(self):
!         del self[options['hammie','header_name']]
          del self[options['pop3proxy','mailid_header_name']]
!         del self[options['hammie','header_name' + "-ID"]]  # test mode header
          del self[options['pop3proxy','prob_header_name']]
          del self[options['pop3proxy','thermostat_header_name']]
--- 294,300 ----
  
      def delSBHeaders(self):
!         del self[options['Hammie','header_name']]
          del self[options['pop3proxy','mailid_header_name']]
!         del self[options['Hammie','header_name' + "-ID"]]  # test mode header
          del self[options['pop3proxy','prob_header_name']]
          del self[options['pop3proxy','thermostat_header_name']]