[Spambayes-checkins] spambayes/testtools mksets.py, 1.7, 1.8 sort+group.py, 1.3, 1.4 timcv.py, 1.8, 1.9

[Tony Meyer]

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

Modified Files:
	mksets.py sort+group.py timcv.py 
Log Message:
Enable -o command line option setting, and follow TestDriver directories.

Index: mksets.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/testtools/mksets.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mksets.py	29 Dec 2003 01:27:32 -0000	1.7
--- mksets.py	6 May 2006 10:30:41 -0000	1.8
***************
*** 3,6 ****
--- 3,7 ----
  # Redistribute messages among the classic Data/{Ham,Spam}/Set* directories,
  # based on desired set count.
+ # Will use the TestDriver directory options.
  
  """Usage: %(program)s [OPTIONS] ...
***************
*** 15,18 ****
--- 16,21 ----
      -m num
          max number of messages per {ham,spam}*group*set; default unlimited
+     -o section:option:value
+         set [section, option] in the options database to value.
  """
  
***************
*** 24,31 ****
  import shutil
  
  program = sys.argv[0]
  loud = True
- hamdir = "Data/Ham"
- spamdir = "Data/Spam"
  nsets = 5               # -n
  ngroups = None          # -g
--- 27,34 ----
  import shutil
  
+ from spambayes.Options import options
+ 
  program = sys.argv[0]
  loud = True
  nsets = 5               # -n
  ngroups = None          # -g
***************
*** 99,103 ****
  
      try:
!         opts, args = getopt.getopt(sys.argv[1:], 'hn:g:m:')
      except getopt.error, msg:
          usage(2, msg)
--- 102,106 ----
  
      try:
!         opts, args = getopt.getopt(sys.argv[1:], 'hn:g:m:o:', ['option='])
      except getopt.error, msg:
          usage(2, msg)
***************
*** 115,118 ****
--- 118,126 ----
          elif opt == '-m':
              nmess = int(arg)
+         elif opt in ('-o', '--option'):
+             options.set_from_cmdline(arg, sys.stderr)
+ 
+     hamdir = os.path.dirname(options["TestDriver", "ham_directories"])
+     spamdir = os.path.dirname(options["TestDriver", "spam_directories"])
  
      distribute(hamdir)

Index: sort+group.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/testtools/sort+group.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sort+group.py	7 Apr 2005 01:33:50 -0000	1.3
--- sort+group.py	6 May 2006 10:30:41 -0000	1.4
***************
*** 88,92 ****
  
      try:
!         opts, args = getopt.getopt(sys.argv[1:], 'hqao:')
      except getopt.error, msg:
          usage(1, msg)
--- 88,92 ----
  
      try:
!         opts, args = getopt.getopt(sys.argv[1:], 'hqao:', ['option='])
      except getopt.error, msg:
          usage(1, msg)

Index: timcv.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/testtools/timcv.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** timcv.py	18 Oct 2004 05:30:47 -0000	1.8
--- timcv.py	6 May 2006 10:30:41 -0000	1.9
***************
*** 132,136 ****
                                     ['HamTrain=', 'SpamTrain=',
                                     'HamTest=', 'SpamTest=',
!                                    'ham-keep=', 'spam-keep='])
      except getopt.error, msg:
          usage(1, msg)
--- 132,137 ----
                                     ['HamTrain=', 'SpamTrain=',
                                     'HamTest=', 'SpamTest=',
!                                    'ham-keep=', 'spam-keep=',
!                                    'option='])
      except getopt.error, msg:
          usage(1, msg)
***************
*** 172,174 ****
--- 173,178 ----
  
  if __name__ == "__main__":
+     import time # Sat Apr 22 14:42:39 2006 - Sat Apr 22 15:37:40 2006 ZODB 400
+     print time.asctime() # Sat Apr 22 15:47:58 2006 - Sat Apr 22 16:38:04 2006 ZODB 10000
      main()
+     print time.asctime() # Sat Apr 22 16:38:47 2006 - Sat Apr 22 17:31:08 2006 pickle