[Spambayes-checkins] spambayes/spambayes CoreUI.py, 1.1.2.1, 1.1.2.2

[Skip Montanaro]

Update of /cvsroot/spambayes/spambayes/spambayes
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv14093

Modified Files:
      Tag: CORESVR
	CoreUI.py 
Log Message:
Damn...  Thwarted in my attempt to move toward PEP8.


Index: CoreUI.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/Attic/CoreUI.py,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** CoreUI.py	18 May 2007 03:54:39 -0000	1.1.2.1
--- CoreUI.py	21 May 2007 12:25:26 -0000	1.1.2.2
***************
*** 855,859 ****
              spambayes.message.Message.message_info_db = None
  
!         self.spam_corpus = self.ham_corpus = self.unknown_corpus = None
          self.spam_trainer = self.ham_trainer = None
  
--- 855,859 ----
              spambayes.message.Message.message_info_db = None
  
!         self.spamCorpus = self.hamCorpus = self.unknownCorpus = None
          self.spam_trainer = self.ham_trainer = None
  
***************
*** 953,963 ****
                  factory = FileMessageFactory()
              age = options["Storage", "cache_expiry_days"]*24*60*60
!             self.spam_corpus = ExpiryFileCorpus(age, factory, sc,
                                                 '[0123456789\-]*',
                                                 cacheSize=20)
!             self.ham_corpus = ExpiryFileCorpus(age, factory, hc,
                                                '[0123456789\-]*',
                                                cacheSize=20)
!             self.unknown_corpus = ExpiryFileCorpus(age, factory, uc,
                                                    '[0123456789\-]*',
                                                    cacheSize=20)
--- 953,963 ----
                  factory = FileMessageFactory()
              age = options["Storage", "cache_expiry_days"]*24*60*60
!             self.spamCorpus = ExpiryFileCorpus(age, factory, sc,
                                                 '[0123456789\-]*',
                                                 cacheSize=20)
!             self.hamCorpus = ExpiryFileCorpus(age, factory, hc,
                                                '[0123456789\-]*',
                                                cacheSize=20)
!             self.unknownCorpus = ExpiryFileCorpus(age, factory, uc,
                                                    '[0123456789\-]*',
                                                    cacheSize=20)
***************
*** 968,980 ****
              # messages from not only the trained corpora, but the unknown
              # as well.
!             self.spam_corpus.removeExpiredMessages()
!             self.ham_corpus.removeExpiredMessages()
!             self.unknown_corpus.removeExpiredMessages()
  
              # Create the Trainers.
              self.spam_trainer = storage.SpamTrainer(self.bayes)
              self.ham_trainer = storage.HamTrainer(self.bayes)
!             self.spam_corpus.addObserver(self.spam_trainer)
!             self.ham_corpus.addObserver(self.ham_trainer)
  
      def get_new_message_name(self):
--- 968,980 ----
              # messages from not only the trained corpora, but the unknown
              # as well.
!             self.spamCorpus.removeExpiredMessages()
!             self.hamCorpus.removeExpiredMessages()
!             self.unknownCorpus.removeExpiredMessages()
  
              # Create the Trainers.
              self.spam_trainer = storage.SpamTrainer(self.bayes)
              self.ham_trainer = storage.HamTrainer(self.bayes)
!             self.spamCorpus.addObserver(self.spam_trainer)
!             self.hamCorpus.addObserver(self.ham_trainer)
  
      def get_new_message_name(self):