[Spambayes-checkins] spambayes/spambayes OptionsClass.py,1.2,1.3

[Tony Meyer]

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

Modified Files:
	OptionsClass.py 
Log Message:
Allow $ in pathnames, and remove and old XXX comment.

Note that this may very well fix
[ 768162 ] UNC path for data_directory?
at least for the original submitter.

Index: OptionsClass.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/OptionsClass.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OptionsClass.py	16 Jun 2003 03:50:14 -0000	1.2
--- OptionsClass.py	9 Jul 2003 04:56:25 -0000	1.3
***************
*** 36,39 ****
--- 36,40 ----
  
  """
+ 
  # This module is part of the spambayes project, which is Copyright 2002-3
  # The Python Software Foundation and is covered by the Python Software
***************
*** 136,146 ****
      def is_valid(self, value):
          '''Check if this is a valid value for this option.'''
- # XXX This test is in the original code, but makes no sense....
- # XXX self.allowed_values defaults to None, and if that is the
- # XXX current value, then whatever is passed would be invalid
- # XXX I agree this is a silly state to be in, but it is possible
- # XXX I suppose that self.allowed_values should default to *any*
- # XXX rather than None, but I'm not sure how to express that,
- # XXX unless the regex r"." is correct.
          if self.allowed_values is None:
              return False
--- 137,140 ----
***************
*** 690,694 ****
  PORT = r"[\d]+"
  EMAIL_ADDRESS = r"[\w\-\.]+@[\w\-\.]+"
! PATH = r"[\w\.\-~:\\/\*]+"
  VARIABLE_PATH = PATH + r"%"
  FILE = r"[\S]+"
--- 684,688 ----
  PORT = r"[\d]+"
  EMAIL_ADDRESS = r"[\w\-\.]+@[\w\-\.]+"
! PATH = r"[\w\$\.\-~:\\/\*]+"
  VARIABLE_PATH = PATH + r"%"
  FILE = r"[\S]+"