[Spambayes-checkins] spambayes FileCorpus.py,1.2.2.2,1.2.2.3

[Tim Stone]

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

Modified Files:
      Tag: hammie-playground
	FileCorpus.py 
Log Message:
Changed use of Verbose to __debug__ (I'm learning all the time)

Index: FileCorpus.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/FileCorpus.py,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** FileCorpus.py	22 Nov 2002 02:08:06 -0000	1.2.2.2
--- FileCorpus.py	25 Nov 2002 05:00:02 -0000	1.2.2.3
***************
*** 37,41 ****
          options:
              -h : show this message
!             -v : execute in verbose mode, useful for general understanding
                   and debugging purposes
              -g : use GzipFileMessage and GzipFileMessageFactory
--- 37,41 ----
          options:
              -h : show this message
!             -v : execute in __debug__ mode, useful for general understanding
                   and debugging purposes
              -g : use GzipFileMessage and GzipFileMessageFactory
***************
*** 133,137 ****
              raise ValueError
  
!         if Corpus.Verbose:
              print 'adding',message.key(),'to corpus'
  
--- 133,137 ----
              raise ValueError
  
!         if __debug__:
              print 'adding',message.key(),'to corpus'
  
***************
*** 145,149 ****
          '''Remove a Message from this corpus'''
  
!         if Corpus.Verbose:
              print 'removing',message.key(),'from corpus'
  
--- 145,149 ----
          '''Remove a Message from this corpus'''
  
!         if __debug__:
              print 'removing',message.key(),'from corpus'
  
***************
*** 163,167 ****
              s = ''
  
!         if Corpus.Verbose and nummsgs > 0:
              lst = ', ' + '%s' % (self.keys())
          else:
--- 163,167 ----
              s = ''
  
!         if __debug__ and nummsgs > 0:
              lst = ', ' + '%s' % (self.keys())
          else:
***************
*** 205,209 ****
          '''Read the Message substance from the file'''
  
!         if Corpus.Verbose:
              print 'loading', self.file_name
  
--- 205,209 ----
          '''Read the Message substance from the file'''
  
!         if __debug__:
              print 'loading', self.file_name
  
***************
*** 221,225 ****
          '''Write the Message substance to the file'''
  
!         if Corpus.Verbose:
              print 'storing', self.file_name
  
--- 221,225 ----
          '''Write the Message substance to the file'''
  
!         if __debug__:
              print 'storing', self.file_name
  
***************
*** 232,236 ****
          '''Message hara-kiri'''
  
!         if Corpus.Verbose:
              print 'physically deleting file',self.pathname()
  
--- 232,236 ----
          '''Message hara-kiri'''
  
!         if __debug__:
              print 'physically deleting file',self.pathname()
  
***************
*** 251,255 ****
          sub = self.getSubstance()
          
!         if Corpus.Verbose:
              sub = self.getSubstance()
          else:
--- 251,255 ----
          sub = self.getSubstance()
          
!         if __debug__:
              sub = self.getSubstance()
          else:
***************
*** 294,298 ****
          '''Read the Message substance from the file'''
  
!         if Corpus.Verbose:
              print 'loading', self.file_name
  
--- 294,298 ----
          '''Read the Message substance from the file'''
  
!         if __debug__:
              print 'loading', self.file_name
  
***************
*** 312,316 ****
          '''Write the Message substance to the file'''
  
!         if Corpus.Verbose:
              print 'storing', self.file_name
  
--- 312,316 ----
          '''Write the Message substance to the file'''
  
!         if __debug__:
              print 'storing', self.file_name
  
***************
*** 687,691 ****
          sys.exit()
  
-     Corpus.Verbose = False
      runTestServer = False
      setupTestServer = False
--- 687,690 ----
***************
*** 707,712 ****
          elif opt == '-c':
              cleanupTestServer = True
-         elif opt == '-v':
-             Corpus.Verbose = True
          elif opt == '-g':
              useGzip = True
--- 706,709 ----