[Spambayes-checkins] spambayes/testtools incremental.py, 1.5, 1.6 mkgraph.py, 1.2, 1.3 regimes.py, 1.2, 1.3 urlslurper.py, 1.5, 1.6

[Tim Peters]

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

Modified Files:
	incremental.py mkgraph.py regimes.py urlslurper.py 
Log Message:
Whitespace normalization.


Index: incremental.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/testtools/incremental.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** incremental.py	5 Sep 2003 01:15:29 -0000	1.5
--- incremental.py	16 Dec 2003 05:06:34 -0000	1.6
***************
*** 333,339 ****
          set = int(set[3:]) - 1
          isspam = (dir.find('Spam') >= 0)
!  
          msg = msgs.Msg(dir, base)
!         
          for j in range(0, nsets):
              if which is not None and j != which:
--- 333,339 ----
          set = int(set[3:]) - 1
          isspam = (dir.find('Spam') >= 0)
! 
          msg = msgs.Msg(dir, base)
! 
          for j in range(0, nsets):
              if which is not None and j != which:
***************
*** 342,346 ****
                  sys.stderr.write("%-78s\r" % ("%s  : %d" % (base, set)))
                  sys.stderr.flush()
!  
                  nham_tested[j].append(tests[j].nham_tested)
                  nham_trained[j].append(tests[j].nham_trained)
--- 342,346 ----
                  sys.stderr.write("%-78s\r" % ("%s  : %d" % (base, set)))
                  sys.stderr.flush()
! 
                  nham_tested[j].append(tests[j].nham_tested)
                  nham_trained[j].append(tests[j].nham_trained)
***************
*** 355,359 ****
                  # tests[j].reset_test_results()
                  rules[j].group_action(j, tests[j])
!  
              if j != set:
                  guess = tests[j].predict([msg], isspam)
--- 355,359 ----
                  # tests[j].reset_test_results()
                  rules[j].group_action(j, tests[j])
! 
              if j != set:
                  guess = tests[j].predict([msg], isspam)
***************
*** 367,371 ****
                  elif todo == 1:
                      tests[j].train([msg], None)
!  
          oldgroup = group
  
--- 367,371 ----
                  elif todo == 1:
                      tests[j].train([msg], None)
! 
          oldgroup = group
  

Index: mkgraph.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/testtools/mkgraph.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mkgraph.py	1 Mar 2003 05:13:08 -0000	1.2
--- mkgraph.py	16 Dec 2003 05:06:34 -0000	1.3
***************
*** 72,77 ****
          print '% linetype=1 linelabel="spam_unsure" markertype=0 linecolor=9'
          line(nspam_unsure)
!    
!     if report == "error": 
          print '$ Data=Curve2d'
          print '% toplabel="%s Error Rates"' % (title)
--- 72,77 ----
          print '% linetype=1 linelabel="spam_unsure" markertype=0 linecolor=9'
          line(nspam_unsure)
! 
!     if report == "error":
          print '$ Data=Curve2d'
          print '% toplabel="%s Error Rates"' % (title)
***************
*** 171,173 ****
  if __name__ == "__main__":
      main()
- 
--- 171,172 ----

Index: regimes.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/testtools/regimes.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** regimes.py	8 Mar 2003 00:33:22 -0000	1.2
--- regimes.py	16 Dec 2003 05:06:34 -0000	1.3
***************
*** 109,111 ****
              self.ham[0].append(msg)
          return actual
- 
--- 109,110 ----

Index: urlslurper.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/testtools/urlslurper.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** urlslurper.py	15 May 2003 00:35:38 -0000	1.5
--- urlslurper.py	16 Dec 2003 05:06:34 -0000	1.6
***************
*** 225,233 ****
          # Build a new opener without any proxy information.
          opener = urllib2.build_opener(urllib2.HTTPHandler)
!      
      # install it
      urllib2.install_opener(opener)
  
!     # read any url cache    
      if os.path.exists(filename):
          f = file(filename, "r")
--- 225,233 ----
          # Build a new opener without any proxy information.
          opener = urllib2.build_opener(urllib2.HTTPHandler)
! 
      # install it
      urllib2.install_opener(opener)
  
!     # read any url cache
      if os.path.exists(filename):
          f = file(filename, "r")