[Spambayes-checkins] spambayes Options.py,1.4,1.5 timtest.py,1.18,1.19

[Tim Peters]

Update of /cvsroot/spambayes/spambayes
In directory usw-pr-cvs1:/tmp/cvs-serv9100

Modified Files:
	Options.py timtest.py 
Log Message:
Screwed my head on straight:  Options should take care of merging in
bayescustomize.ini rather than making every client muck with it.


Index: Options.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Options.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Options.py	10 Sep 2002 00:06:36 -0000	1.4
--- Options.py	10 Sep 2002 01:53:12 -0000	1.5
***************
*** 65,67 ****
  
  options = OptionsClass()
! options.mergefiles(['bayes.ini'])
--- 65,67 ----
  
  options = OptionsClass()
! options.mergefiles(['bayes.ini', 'bayescustomize.ini'])

Index: timtest.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/timtest.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** timtest.py	10 Sep 2002 00:06:37 -0000	1.18
--- timtest.py	10 Sep 2002 01:53:12 -0000	1.19
***************
*** 292,295 ****
          usage(1, "-n is required")
  
-     options.mergefiles(['bayescustomize.ini'])
      drive(nsets)
--- 292,294 ----