[Spambayes-checkins] spambayes/spambayes Options.py,1.39,1.40

[Tony Meyer]

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

Modified Files:
	Options.py 
Log Message:
Fix for SF[ 725616 ] provided by Sjoerd Mullender.

(Didn't escape - in three regexs).  Who knows why this
sometimes worked...

Index: Options.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/Options.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** Options.py	22 Apr 2003 07:12:23 -0000	1.39
--- Options.py	22 Apr 2003 22:19:48 -0000	1.40
***************
*** 11,15 ****
  BAYESCUSTOMIZE is checked for a list of names, if nothing is found
  then the local directory and the home directory are checked for a
! file caleld bayescustomize.ini and the initial values are loaded from
  this.
  
--- 11,15 ----
  BAYESCUSTOMIZE is checked for a list of names, if nothing is found
  then the local directory and the home directory are checked for a
! file called bayescustomize.ini and the initial values are loaded from
  this.
  
***************
*** 105,110 ****
  # permitted values. Although the majority of options use one of these,
  # you may use any regex or tuple you wish.
! HEADER_NAME = r"[\w\.-\*]+"
! HEADER_VALUE = r"[\w\.-\*]+"
  INTEGER = r"[\d]+"              # actually, a *positive* integer
  REAL = r"[\d]+[\.]?[\d]*"       # likewise, a *positive* real
--- 105,110 ----
  # permitted values. Although the majority of options use one of these,
  # you may use any regex or tuple you wish.
! HEADER_NAME = r"[\w\.\-\*]+"
! HEADER_VALUE = r"[\w\.\-\*]+"
  INTEGER = r"[\d]+"              # actually, a *positive* integer
  REAL = r"[\d]+[\.]?[\d]*"       # likewise, a *positive* real
***************
*** 113,117 ****
  PORT = r"[\d]+"
  EMAIL_ADDRESS = r"[\w\-\.]+@[\w\-\.]+"
! PATH = r"[\w\.-~:\\/\*]+"
  VARIABLE_PATH = PATH + r"%"
  FILE = r"[\S]+"
--- 113,117 ----
  PORT = r"[\d]+"
  EMAIL_ADDRESS = r"[\w\-\.]+@[\w\-\.]+"
! PATH = r"[\w\.\-~:\\/\*]+"
  VARIABLE_PATH = PATH + r"%"
  FILE = r"[\S]+"