Update of /cvsroot/spambayes/spambayes/spambayes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17160/spambayes
Modified Files:
Options.py
Log Message:
Fix the handling of the notate_to and notate_subject options. Previously,
although
these could be set to whatever the header_X_string options were, that could
only
be at runtime, not when loading in the config string - so they would revert
whenever
spambayes was restarted.
Now we special case them all over the damn place (stupid OE).
Here we are just ripping out the old code.
Index: Options.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/Options.py,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** Options.py 6 Apr 2005 02:37:17 -0000 1.123
--- Options.py 22 May 2005 03:33:15 -0000 1.124
***************
*** 434,438 ****
or only spam. This is a disaster.
! As unknown_word_strength tends toward infintity, all probabilities
tend toward unknown_word_prob. All reports were that a value near 0.4
worked best, so this does not seem to be corpus-dependent."""),
--- 434,438 ----
or only spam. This is a disaster.
! As unknown_word_strength tends toward infinity, all probabilities
tend toward unknown_word_prob. All reports were that a value near 0.4
worked best, so this does not seem to be corpus-dependent."""),
***************
*** 1227,1244 ****
options.merge_file(optionsPathname)
- # Annoyingly, we have a special case. The notate_to and notate_subject
- # allowed values have to be set to the same values as the header_x_
- # options, but this can't be done (AFAIK) dynmaically. If this isn't
- # the case, then if the header_x_string values are changed, the
- # notate_ options don't work. Outlook Express users like both of
- # these options...so we fix it here. See also sf #944109.
- header_strings = (options["Headers", "header_ham_string"],
- options["Headers", "header_spam_string"],
- options["Headers", "header_unsure_string"])
- notate_to = options.get_option("Headers", "notate_to")
- notate_subject = options.get_option("Headers", "notate_subject")
- notate_to.allowed_values = header_strings
- notate_subject.allowed_values = header_strings
-
def get_pathname_option(section, option):
--- 1227,1230 ----
_______________________________________________
Spambayes-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/spambayes-checkins
