[Spambayes-checkins] spambayes/spambayes Options.py, 1.107, 1.107.4.1

[Tony Meyer]

Update of /cvsroot/spambayes/spambayes/spambayes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19106/spambayes

Modified Files:
      Tag: release_1_0-branch
	Options.py 
Log Message:
Backport docstring option fixes.

Backport fix for notate_to/notate_subject with different classification strings.

Index: Options.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/Options.py,v
retrieving revision 1.107
retrieving revision 1.107.4.1
diff -C2 -d -r1.107 -r1.107.4.1
*** Options.py	12 Apr 2004 01:59:26 -0000	1.107
--- Options.py	15 Oct 2004 05:54:54 -0000	1.107.4.1
***************
*** 560,565 ****
       better at classifying your email.  This option specifies the
       name of the database file.  If you don't give a full pathname,
!      the name will be taken to be relative to the current working
!      directory.""",
       FILE_WITH_PATH, DO_NOT_RESTORE),
  
--- 560,565 ----
       better at classifying your email.  This option specifies the
       name of the database file.  If you don't give a full pathname,
!      the name will be taken to be relative to the location of the
!      most recent configuration file loaded.""",
       FILE_WITH_PATH, DO_NOT_RESTORE),
  
***************
*** 570,575 ****
       or reclassified (unless specifically requested to).  This option
       specifies the name of the database file.  If you don't give a
!      full pathname, the name will be taken to be relative to the current
!      working directory.""",
       FILE_WITH_PATH, DO_NOT_RESTORE),
  
--- 570,575 ----
       or reclassified (unless specifically requested to).  This option
       specifies the name of the database file.  If you don't give a
!      full pathname, the name will be taken to be relative to the location
!      of the most recent configuration file loaded.""",
       FILE_WITH_PATH, DO_NOT_RESTORE),
  
***************
*** 581,585 ****
       """Messages will be expired from the cache after this many days.
       After this time, you will no longer be able to train on these messages
!      (note this does not effect the copy of the message that you have in
       your mail client).""",
       INTEGER, RESTORE),
--- 581,585 ----
       """Messages will be expired from the cache after this many days.
       After this time, you will no longer be able to train on these messages
!      (note this does not affect the copy of the message that you have in
       your mail client).""",
       INTEGER, RESTORE),
***************
*** 798,802 ****
       SERVER, DO_NOT_RESTORE),
  
!     ("allow_remote_connections", "Allowed remote connections", "localhost",
       """Enter a list of trusted IPs, separated by commas. Remote POP
       connections from any of them will be allowed. You can trust any
--- 798,802 ----
       SERVER, DO_NOT_RESTORE),
  
!     ("allow_remote_connections", "Allowed remote POP3 connections", "localhost",
       """Enter a list of trusted IPs, separated by commas. Remote POP
       connections from any of them will be allowed. You can trust any
***************
*** 836,840 ****
       SERVER, DO_NOT_RESTORE),
  
!     ("allow_remote_connections", "Allowed remote connections", "localhost",
       """Enter a list of trusted IPs, separated by commas. Remote SMTP
       connections from any of them will be allowed. You can trust any
--- 836,840 ----
       SERVER, DO_NOT_RESTORE),
  
!     ("allow_remote_connections", "Allowed remote SMTP connections", "localhost",
       """Enter a list of trusted IPs, separated by commas. Remote SMTP
       connections from any of them will be allowed. You can trust any
***************
*** 893,897 ****
       BOOLEAN, RESTORE),
  
!     ("allow_remote_connections", "Allowed remote connections", "localhost",
       """Enter a list of trusted IPs, separated by commas. Remote
       connections from any of them will be allowed. You can trust any
--- 893,897 ----
       BOOLEAN, RESTORE),
  
!     ("allow_remote_connections", "Allowed remote UI connections", "localhost",
       """Enter a list of trusted IPs, separated by commas. Remote
       connections from any of them will be allowed. You can trust any
***************
*** 1229,1232 ****
--- 1229,1247 ----
                          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):
      """Return the option relative to the path specified in the