[Spambayes-checkins] spambayes/Outlook2000 manager.py,1.40,1.41 msgstore.py,1.36,1.37 train.py,1.22,1.23

[Anthony Baxter]

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

Modified Files:
	manager.py msgstore.py train.py 
Log Message:
merging reorg-branch into the trunk. 


Index: manager.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/manager.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** manager.py	10 Jan 2003 00:33:10 -0000	1.40
--- manager.py	14 Jan 2003 05:38:19 -0000	1.41
***************
*** 44,48 ****
      os.environ["BAYESCUSTOMIZE"] = ini_filename
      try:
!         import classifier
      except ImportError:
          parent = os.path.abspath(os.path.join(os.path.dirname(this_filename),
--- 44,48 ----
      os.environ["BAYESCUSTOMIZE"] = ini_filename
      try:
!         from spambayes import classifier
      except ImportError:
          parent = os.path.abspath(os.path.join(os.path.dirname(this_filename),
***************
*** 50,55 ****
          sys.path.insert(0, parent)
  
!     import classifier
!     from tokenizer import tokenize
      bayes_classifier = classifier
      bayes_tokenize = tokenize
--- 50,55 ----
          sys.path.insert(0, parent)
  
!     from spambayes import classifier
!     from spambayes.tokenizer import tokenize
      bayes_classifier = classifier
      bayes_tokenize = tokenize

Index: msgstore.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/msgstore.py,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** msgstore.py	25 Nov 2002 05:57:41 -0000	1.36
--- msgstore.py	14 Jan 2003 05:38:20 -0000	1.37
***************
*** 431,435 ****
          # Note we *dont* look in plain text attachments, which we arguably
          # should.
!         import mboxutils
  
          self._EnsureObject()
--- 431,435 ----
          # Note we *dont* look in plain text attachments, which we arguably
          # should.
!         from spambayes import mboxutils
  
          self._EnsureObject()

Index: train.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/train.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** train.py	16 Dec 2002 04:12:00 -0000	1.22
--- train.py	14 Jan 2003 05:38:20 -0000	1.23
***************
*** 34,38 ****
      # If re-classified AND rescore = True, then a new score will
      # be written to the message (so the user can see some effects)
!     from tokenizer import tokenize
  
      was_spam = mgr.message_db.get(msg.searchkey)
--- 34,38 ----
      # If re-classified AND rescore = True, then a new score will
      # be written to the message (so the user can see some effects)
!     from spambayes.tokenizer import tokenize
  
      was_spam = mgr.message_db.get(msg.searchkey)
***************
*** 63,67 ****
  #         False == was_ham
  def untrain_message(msg, mgr):
!     from tokenizer import tokenize
      stream = msg.GetEmailPackageObject()
      if been_trained_as_spam(msg, mgr):
--- 63,67 ----
  #         False == was_ham
  def untrain_message(msg, mgr):
!     from spambayes.tokenizer import tokenize
      stream = msg.GetEmailPackageObject()
      if been_trained_as_spam(msg, mgr):