From montanaro at users.sourceforge.net  Mon Jun  2 08:40:51 2003
From: montanaro at users.sourceforge.net (Skip Montanaro)
Date: Mon Jun  2 10:40:55 2003
Subject: [Spambayes-checkins] website faq.txt,1.1,1.2
Message-ID: <E19MqUV-0007k8-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	faq.txt 
Log Message:
added a new q&a from Bill Parducci about how long to keep training data.


Index: faq.txt
===================================================================
RCS file: /cvsroot/spambayes/website/faq.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** faq.txt	31 May 2003 01:32:46 -0000	1.1
--- faq.txt	2 Jun 2003 14:40:48 -0000	1.2
***************
*** 432,435 ****
--- 432,452 ----
  
  
+ Do I need to keep spam after it has been trained? If so, for how long?
+ ----------------------------------------------------------------------
+ 
+ Once a message has been [correctly] trained there is no need to keep it
+ around. However, Spambayes' accuracy is dependent upon having a "sufficient"
+ sample from which to make its decisions. Therefore, most users retain a fair
+ amount of spam in the event that they may wish to rebuild the corpus from
+ scratch.
+ 
+ Of course, this begs the question: "how much is enough?" That is where the
+ "art" of spambayes meets the science. Some users keep as many as several
+ thousand [recent] spam (as well as a similar number of ham). That is not to
+ say that you won't have excellent results with a tenth (or less) of that
+ number; since everyone's e-mail profile is different, the requirements for
+ training are as well.
+ 
+ 
  Why did Spambayes mark this obvious spam "unsure"?
  --------------------------------------------------



From mhammond at users.sourceforge.net  Tue Jun  3 07:49:55 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Tue Jun  3 09:49:59 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000/docs
	troubleshooting.html, 1.5, 1.6
Message-ID: <E19NCAl-0006MJ-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	troubleshooting.html 
Log Message:
Document that "Local Settings" is hidden by default on XP/2000.


Index: troubleshooting.html
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/docs/troubleshooting.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** troubleshooting.html	30 May 2003 03:56:27 -0000	1.5
--- troubleshooting.html	3 Jun 2003 13:49:51 -0000	1.6
***************
*** 97,103 ****
    <li>Try resetting the toolbars:
      <ol>
!       <li>Select <span style="font-style: italic;">View</span>-&gt;
!         <span style="font-style: italic;">Toolbars</span>-&gt;
!         <span style="font-style: italic;">Customize</span> to display
  the toolbar options dialog</li>
        <li>Select the tab labelled <span style="font-style: italic;">Toolbars</span>,
--- 97,103 ----
    <li>Try resetting the toolbars:
      <ol>
!       <li>Select <span style="font-style: italic;">View</span>-&gt; <span
!  style="font-style: italic;">Toolbars</span>-&gt; <span
!  style="font-style: italic;">Customize</span> to display
  the toolbar options dialog</li>
        <li>Select the tab labelled <span style="font-style: italic;">Toolbars</span>,
***************
*** 194,207 ****
  or <span style="font-style: italic;">\Documents and
  Settings\{username}\Local
! Settings\Temp</span> for Windows 2000/XP.&nbsp; The log file for the
  most recent execution of Outlook is named <span
   style="font-style: italic;">spambayes1.log</span>, the second most
  recent is named <span style="font-style: italic;">spambayes2.log</span>,
! and so on for the four previous runs.<br>
! You can view this file with notepad.&nbsp; Usually, you will simply see
! messages which indicate that SpamBayes is doing its job.&nbsp; However,
! in some cases there will be errors in this file.<br>
! If SpamBayes fails to perform correctly, please locate the log file and
! <a href="#ReportABug">report a bug</a>.<br>
  <h3><a name="ReportABug"></a>Report a bug</h3>
  All SpamBayes bugs are maintained in <a
--- 194,232 ----
  or <span style="font-style: italic;">\Documents and
  Settings\{username}\Local
! Settings\Temp</span> for Windows 2000/XP.<br>
! <br>
! Note that by default, in Windows 2000 and XP, Windows Explorer will not
! show the <span style="font-style: italic;">Local Settings</span>
! directory, as it is hidden.&nbsp; You can convince Windows Explorer to
! show this directory (and therefore allow you to see the <span
!  style="font-style: italic;">Temp</span> directory under it by doing
! either:<br>
! <ul>
!   <li>Select the folder <span style="font-style: italic;">\Documents
! and Settings\{username}</span>.&nbsp; This directory should be
! reflected in the Address Bar.&nbsp; In the Address Bar, simply type at
! the end "\Local Settings" (thereby giving that full path name), and
! press <span style="font-style: italic;">Enter</span>.&nbsp; Explorer
! will then show this folder.</li>
! </ul>
! or
! <ul>
!   <li>Select <span style="font-style: italic;">Tools-&gt;Folder Options</span>,
! select the <span style="font-style: italic;">View</span> tab, and in
! the list, select <span style="font-style: italic;">Show hidden files
! and folders</span>.&nbsp; Select OK.&nbsp; This folder will now be
! visible.&nbsp; You may like to then reset this option back to the
! default value.<br>
!   </li>
! </ul>
! The log file for the
  most recent execution of Outlook is named <span
   style="font-style: italic;">spambayes1.log</span>, the second most
  recent is named <span style="font-style: italic;">spambayes2.log</span>,
! and so on for the four previous runs.&nbsp; You can view this file with
! notepad.&nbsp; Usually, you will simply see
! messages which indicate that SpamBayes is doing its job; however
! in some cases there will be errors in this file.&nbsp; If there are
! errors, please <a href="#ReportABug">report a bug</a>.<br>
  <h3><a name="ReportABug"></a>Report a bug</h3>
  All SpamBayes bugs are maintained in <a



From montanaro at users.sourceforge.net  Tue Jun  3 09:45:52 2003
From: montanaro at users.sourceforge.net (Skip Montanaro)
Date: Tue Jun  3 11:45:55 2003
Subject: [Spambayes-checkins] spambayes hammiecli.py,1.3,1.4
Message-ID: <E19NDyy-0007Uc-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	hammiecli.py 
Log Message:
tweak docstring


Index: hammiecli.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/hammiecli.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** hammiecli.py	21 Nov 2002 04:36:21 -0000	1.3
--- hammiecli.py	3 Jun 2003 15:45:48 -0000	1.4
***************
*** 4,8 ****
  
  Just feed it your mail on stdin, and it spits out the same message
! with a new X-Hammie-Disposition header.
  
  """
--- 4,8 ----
  
  Just feed it your mail on stdin, and it spits out the same message
! with the spambayes score in a new X-Spambayes-Disposition header.
  
  """



From mhammond at users.sourceforge.net  Tue Jun  3 19:47:15 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Tue Jun  3 21:47:19 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000 msgstore.py,1.44,1.45
Message-ID: <E19NNMx-0005UQ-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	msgstore.py 
Log Message:
Get even more brutal with the message when the email package still barfs.


Index: msgstore.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/msgstore.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** msgstore.py	20 May 2003 00:30:45 -0000	1.44
--- msgstore.py	4 Jun 2003 01:47:13 -0000	1.45
***************
*** 666,670 ****
                  # structure, just the words it contains, so no harm and
                  # much good in trying to suppress this error.
!                 msg = email.message_from_string(text + "\n\n")
          except:
              print "FAILED to create email.message from: ", `text`
--- 666,687 ----
                  # structure, just the words it contains, so no harm and
                  # much good in trying to suppress this error.
!                 try:
!                     msg = email.message_from_string(text + "\n\n")
!                 except email.Errors.BoundaryError:
!                     # But even this doesn't get *everything*.  We can still see:
!                     #  "multipart message with no defined boundary"
!                     # so now it is time to turn into a butcher - hack out
!                     # the Content-Type header, so we see it as plain text.
!                     butcher_pos = text.lower().find("\ncontent-type: ")
!                     if butcher_pos < 0:
!                         # This error just just gunna get caught below anyway
!                         raise RuntimeError(
!                             "email package croaked with boundary error, but "
!                             "there appears to be no 'Content-Type' header")
!                     # Put it back together, skipping the original "\n" but
!                     # leaving the header leaving "\nSpamBayes-Content-Type: "
!                     butchered = text[:butcher_pos] + "\nSpamBayes-" + \
!                                 text[butcher_pos+1:] + "\n\n"
!                     msg = email.message_from_string(butchered)
          except:
              print "FAILED to create email.message from: ", `text`



From mhammond at users.sourceforge.net  Tue Jun  3 20:45:18 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Tue Jun  3 22:45:23 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000 addin.py,1.57,1.58
Message-ID: <E19NOH8-0000sw-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	addin.py 
Log Message:
Change the way we use toolbars - create our own, and add our items to that.
Seems to work fine for me.  You may need to reset your standard toolbar if
the old items are there.

Attempts were made to save the database when classifying - although the
save didn't happen (not dirty) is was an error.

Log refers to "SpamBayes" rather than "SpamAddin"

Wait cursor when incremental training (as it now includes the save, and
with many message selected, takes a long time anyway)


Index: addin.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/addin.py,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** addin.py	16 May 2003 03:50:56 -0000	1.57
--- addin.py	4 Jun 2003 02:45:14 -0000	1.58
***************
*** 22,28 ****
--- 22,31 ----
  import pythoncom
  from win32com.client import constants, getevents
+ import win32ui
  
  import win32gui, win32con, win32clipboard # for button images!
  
+ toolbar_name = "SpamBayes"
+ 
  # If we are not running in a console, redirect all print statements to the
  # win32traceutil collector.
***************
*** 237,242 ****
                      print "already was trained as spam"
                  assert train.been_trained_as_spam(msgstore_message, self.manager)
!             # And if the DB can save itself incrementally, do it now
!             self.manager.SaveBayesPostIncrementalTrain()
  
  # Event function fired from the "Show Clues" UI items.
--- 240,245 ----
                      print "already was trained as spam"
                  assert train.been_trained_as_spam(msgstore_message, self.manager)
!                 # And if the DB can save itself incrementally, do it now
!                 self.manager.SaveBayesPostIncrementalTrain()
  
  # Event function fired from the "Show Clues" UI items.
***************
*** 348,351 ****
--- 351,355 ----
          if not msgstore_messages:
              return
+         win32ui.DoWaitCursor(1)
          # Delete this item as spam.
          spam_folder_id = self.manager.config.filter.spam_folder_id
***************
*** 359,363 ****
              # Must train before moving, else we lose the message!
              subject = msgstore_message.GetSubject()
!             print "Deleting and spam training message '%s' - " % (subject,),
              if train.train_message(msgstore_message, True, self.manager, rescore = True):
                  print "trained as spam"
--- 363,367 ----
              # Must train before moving, else we lose the message!
              subject = msgstore_message.GetSubject()
!             print "Moving and spam training message '%s' - " % (subject,),
              if train.train_message(msgstore_message, True, self.manager, rescore = True):
                  print "trained as spam"
***************
*** 370,373 ****
--- 374,378 ----
          # And if the DB can save itself incrementally, do it now
          self.manager.SaveBayesPostIncrementalTrain()
+         win32ui.DoWaitCursor(0)
  
  class ButtonRecoverFromSpamEvent(ButtonDeleteAsEventBase):
***************
*** 388,391 ****
--- 393,397 ----
          if not msgstore_messages:
              return
+         win32ui.DoWaitCursor(1)
          # Get the inbox as the default place to restore to
          # (incase we dont know (early code) or folder removed etc
***************
*** 417,420 ****
--- 423,427 ----
          # And if the DB can save itself incrementally, do it now
          self.manager.SaveBayesPostIncrementalTrain()
+         win32ui.DoWaitCursor(0)
  
  # Helpers to work with images on buttons/toolbars.
***************
*** 445,448 ****
--- 452,456 ----
          self.have_setup_ui = False
          self.explorer_list = explorer_list
+         self.toolbar = None
          self.buttons = []
  
***************
*** 451,474 ****
          self.buttons = []
          activeExplorer = self
!         bars = activeExplorer.CommandBars
!         toolbar = bars.Item("Standard")
          # Add our "Delete as ..." and "Recover as" buttons
          self.but_delete_as = self._AddControl(
!                         toolbar,
                          constants.msoControlButton,
                          ButtonDeleteAsSpamEvent, (self.manager, self),
!                         BeginGroup = True,
!                         Tag = "SpamBayes.DeleteAsSpam")
          # And again for "Recover as"
          self.but_recover_as = self._AddControl(
!                         toolbar,
                          constants.msoControlButton,
                          ButtonRecoverFromSpamEvent, (self.manager, self),
!                         Tag = "SpamBayes.RecoverFromSpam")
  
          # The main tool-bar dropdown with all our entries.
          # Add a pop-up menu to the toolbar
          popup = self._AddControl(
!                         toolbar,
                          constants.msoControlPopup,
                          None, None,
--- 459,481 ----
          self.buttons = []
          activeExplorer = self
!         assert self.toolbar is None, "Should not yet have a toolbar"
          # Add our "Delete as ..." and "Recover as" buttons
          self.but_delete_as = self._AddControl(
!                         None,
                          constants.msoControlButton,
                          ButtonDeleteAsSpamEvent, (self.manager, self),
!                         BeginGroup = False,
!                         Tag = "SpamBayesCommand.DeleteAsSpam")
          # And again for "Recover as"
          self.but_recover_as = self._AddControl(
!                         None,
                          constants.msoControlButton,
                          ButtonRecoverFromSpamEvent, (self.manager, self),
!                         Tag = "SpamBayesCommand.RecoverFromSpam")
  
          # The main tool-bar dropdown with all our entries.
          # Add a pop-up menu to the toolbar
          popup = self._AddControl(
!                         None,
                          constants.msoControlPopup,
                          None, None,
***************
*** 476,480 ****
                          TooltipText = "Anti-Spam filters and functions",
                          Enabled = True,
!                         Tag = "SpamBayes.Popup")
          # Convert from "CommandBarItem" to derived
          # "CommandBarPopup" Not sure if we should be able to work
--- 483,487 ----
                          TooltipText = "Anti-Spam filters and functions",
                          Enabled = True,
!                         Tag = "SpamBayesCommand.Popup")
          # Convert from "CommandBarItem" to derived
          # "CommandBarPopup" Not sure if we should be able to work
***************
*** 490,494 ****
                         TooltipText = "Show the Anti-Spam manager dialog.",
                         Enabled = True,
!                        Tag = "SpamBayes.Manager")
          self._AddControl(popup,
                         constants.msoControlButton,
--- 497,502 ----
                         TooltipText = "Show the Anti-Spam manager dialog.",
                         Enabled = True,
!                        Visible=True,
!                        Tag = "SpamBayesCommand.Manager")
          self._AddControl(popup,
                         constants.msoControlButton,
***************
*** 496,500 ****
                         Caption="Show spam clues for current message",
                         Enabled=True,
!                        Tag = "SpamBayes.Clues")
          # If we are running from Python sources, enable a few extra items
          if not hasattr(sys, "frozen"):
--- 504,509 ----
                         Caption="Show spam clues for current message",
                         Enabled=True,
!                        Visible=True,
!                        Tag = "SpamBayesCommand.Clues")
          # If we are running from Python sources, enable a few extra items
          if not hasattr(sys, "frozen"):
***************
*** 504,508 ****
                             Caption="Execute test suite",
                             Enabled=True,
!                            Tag = "SpamBayes.TestSuite")
          self.have_setup_ui = True
  
--- 513,518 ----
                             Caption="Execute test suite",
                             Enabled=True,
!                            Visible=True,
!                            Tag = "SpamBayesCommand.TestSuite")
          self.have_setup_ui = True
  
***************
*** 512,537 ****
                      events_class, events_init_args, # class/Init() args
                      **item_attrs): # extra control attributes.
!         # Sigh - sometimes our toolbar etc items will become
!         # permanent, even though we make them temporary.
!         # I found
          # http://groups.google.com/groups?threadm=eKKmbvQvAHA.1808%40tkmsftngp02
!         # Maybe we should consider making them permanent - this would then
!         # allow the user to drag them around the toolbars and have them
!         # stick.  The downside is that should the user uninstall this addin
!         # there is no clean way to remove the buttons.  Do we even care?
          assert item_attrs.has_key('Tag'), "Need a 'Tag' attribute!"
-         # Note we search *all* command bars here for the tag, only
-         # adding to the specified bar if not found.
          item = self.CommandBars.FindControl(
                          Type = control_type,
                          Tag = item_attrs['Tag'])
          if item is None:
!             item = parent.Controls.Add(Type=control_type, Temporary=True)
          # Hook events for the item
          if events_class is not None:
              item = DispatchWithEvents(item, events_class)
              item.Init(*events_init_args)
          for attr, val in item_attrs.items():
              setattr(item, attr, val)
          self.buttons.append(item)
          return item
--- 522,576 ----
                      events_class, events_init_args, # class/Init() args
                      **item_attrs): # extra control attributes.
!         # Outlook Toolbars suck :)
!         # We have tried a number of options: temp/perm in the standard toolbar,
!         # Always creating our own toolbar, etc.
!         # This seems to be fairly common:
          # http://groups.google.com/groups?threadm=eKKmbvQvAHA.1808%40tkmsftngp02
!         # Now the strategy is just to use our own, permanent toolbar, with
!         # permanent items, and ignore uninstall issues.
!         # We search all commandbars for a control with our Tag.  If found, we
!         # use it (the user may have customized the bar and moved our buttons
!         # elsewhere).  If we can not find the child control, we then try and
!         # locate our toolbar, creating if necessary.  Our items get added to
!         # that.
          assert item_attrs.has_key('Tag'), "Need a 'Tag' attribute!"
          item = self.CommandBars.FindControl(
                          Type = control_type,
                          Tag = item_attrs['Tag'])
          if item is None:
!             if parent is None:
!                 # No parent specified - that means top-level - locate the
!                 # toolbar to use as the parent.
!                 if self.toolbar is None:
!                     # See if we can find our "SpamBayes" toolbar
!                     # Indexing via the name appears unreliable, so just loop
!                     # Pity we have no "Tag" on a toolbar - then we could even
!                     # handle being renamed by the user.
!                     bars = self.CommandBars
!                     for i in range(bars.Count):
!                         toolbar = bars.Item(i+1)
!                         if toolbar.Name == "SpamBayes":
!                             self.toolbar = toolbar
!                             print "Found SB toolbar - visible state is", toolbar.Visible
!                             break
!                     else:
!                         # for not broken - can't find toolbar.  Create a new one.
!                         # Create it as a permanent one (which is default)
!                         print "Creating new SpamBayes toolbar to host our buttons"
!                         self.toolbar = bars.Add(toolbar_name, constants.msoBarTop, Temporary=False)
!                     self.toolbar.Visible = True
!                 parent = self.toolbar
!             # Now add the item itself to the parent.
!             item = parent.Controls.Add(Type=control_type, Temporary=False)
          # Hook events for the item
          if events_class is not None:
              item = DispatchWithEvents(item, events_class)
              item.Init(*events_init_args)
+         # Set the extra attributes passed in.
          for attr, val in item_attrs.items():
              setattr(item, attr, val)
+         # remember and return the item.
+         # (not remembering causes events to get disconnected as our objects
+         # destruct)
          self.buttons.append(item)
          return item
***************
*** 579,582 ****
--- 618,622 ----
              if closer is not None:
                  closer()
+         self.toolbar = None
          self.buttons = []
          self.close() # disconnect events.
***************
*** 665,669 ****
          # automatically disabled by Outlook.
          # Our error reporter is in the "manager" module, so we get that first
!         print "SpamAddin - Connecting to Outlook"
          import manager
          try:
--- 705,709 ----
          # automatically disabled by Outlook.
          # Our error reporter is in the "manager" module, so we get that first
!         print "SpamBayes - Connecting to Outlook"
          import manager
          try:
***************
*** 767,775 ****
  
      def OnDisconnection(self, mode, custom):
!         print "SpamAddin - Disconnecting from Outlook"
          self.folder_hooks = None
          self.application = None
          self.explorers_events = None
          if self.manager is not None:
              self.manager.Save()
              stats = self.manager.stats
--- 807,819 ----
  
      def OnDisconnection(self, mode, custom):
!         print "SpamBayes - Disconnecting from Outlook"
          self.folder_hooks = None
          self.application = None
          self.explorers_events = None
          if self.manager is not None:
+             # Save database - bsddb databases will generally do nothing here
+             # as it will not be dirty, but pickles will.
+             # config never needs saving as it is always done by whoever changes
+             # it (ie, the dialog)
              self.manager.Save()
              stats = self.manager.stats



From mhammond at users.sourceforge.net  Tue Jun  3 20:46:50 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Tue Jun  3 22:46:53 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000 manager.py,1.58,1.59
Message-ID: <E19NOIc-0000zu-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	manager.py 
Log Message:
Don't save the config as part of a general "manager.Save()" - config is now
saved explicitly after the dialog closes, and this prevents us writing the
config pickle at shutdown and various other times.


Index: manager.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/manager.py,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** manager.py	16 May 2003 03:50:56 -0000	1.58
--- manager.py	4 Jun 2003 02:46:47 -0000	1.59
***************
*** 485,492 ****
              self.config._dump()
              print " ->", self.config_filename
          SavePickle(self.config, self.config_filename)
  
      def Save(self):
!         self.SaveConfig()
          if self.bayes_dirty:
              self.SaveBayes()
--- 485,495 ----
              self.config._dump()
              print " ->", self.config_filename
+         assert self.config, "Have no config to save!"
          SavePickle(self.config, self.config_filename)
  
      def Save(self):
!         # No longer save the config here - do it explicitly when changing it
!         # (prevents lots of extra pickle writes, for no good reason.  Other
!         # alternative is a dirty flag for config - this is simpler)
          if self.bayes_dirty:
              self.SaveBayes()



From mhammond at users.sourceforge.net  Tue Jun  3 20:49:13 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Tue Jun  3 22:49:16 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000/images
	delete_as_spam.bmp, 1.1, 1.2 recover_ham.bmp, 1.1, 1.2
Message-ID: <E19NOKv-0001Ba-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	delete_as_spam.bmp recover_ham.bmp 
Log Message:
Toolbar icons cleaned up (contributed, but I deleted their mail :( 


Index: delete_as_spam.bmp
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/images/delete_as_spam.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvss02VHj and /tmp/cvsa4BV7s differ

Index: recover_ham.bmp
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/images/recover_ham.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvs35mRcq and /tmp/cvsCjY34F differ



From mhammond at users.sourceforge.net  Tue Jun  3 20:56:01 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Tue Jun  3 22:56:04 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000/docs
	troubleshooting.html, 1.6, 1.7
Message-ID: <E19NORV-0001cU-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	troubleshooting.html 
Log Message:
Reflect changes to the toolbars.


Index: troubleshooting.html
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/docs/troubleshooting.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** troubleshooting.html	3 Jun 2003 13:49:51 -0000	1.6
--- troubleshooting.html	4 Jun 2003 02:55:59 -0000	1.7
***************
*** 31,36 ****
  toolbar items.&nbsp; <a href="#NoToolbar">Follow this procedure to
  restore the toolbar</a>.&nbsp; If there is an error in the log file,
! please <a
!  href="file:///E:/src/spambayes/Outlook2000/docs/troubleshooting.html#ReportABug">report
  a bug</a>.&nbsp; If no log file for this session exists, continue the
  following steps.</li>
--- 31,35 ----
  toolbar items.&nbsp; <a href="#NoToolbar">Follow this procedure to
  restore the toolbar</a>.&nbsp; If there is an error in the log file,
! please <a href="#ReportABug">report
  a bug</a>.&nbsp; If no log file for this session exists, continue the
  following steps.</li>
***************
*** 92,97 ****
  following:.&nbsp;
  <ul>
!   <li>Make sure that you are displaying the 'Standard' toolbar - select
! View -&gt; Toolbars, and ensure that "Standard" is selected.<br>
    </li>
    <li>Try resetting the toolbars:
--- 91,97 ----
  following:.&nbsp;
  <ul>
!   <li>Make sure that you are displaying the 'SpamBayes' toolbar -
! select
! View -&gt; Toolbars, and ensure that "SpamBayes" is selected.<br>
    </li>
    <li>Try resetting the toolbars:
***************
*** 104,111 ****
  select the 'Standard' toolbar,
  and click <span style="font-style: italic;">Reset</span></li>
      </ol>
    </li>
!   <li>Restart Outlook<br>
!   </li>
  </ul>
  <h2><a name="Messages_fail_to_filter"></a>Messages fail to filter</h2>
--- 104,130 ----
  select the 'Standard' toolbar,
  and click <span style="font-style: italic;">Reset</span></li>
+       <li>Restart Outlook </li>
      </ol>
    </li>
!   <li>Try deleting the SpamBayes toolbar</li>
!   <ol>
!     <li>Select <span style="font-style: italic;">View</span>-&gt; <span
!  style="font-style: italic;">Toolbars</span>-&gt; <span
!  style="font-style: italic;">Customize</span> to display
! the toolbar options dialog</li>
!     <li>Select the tab labelled <span style="font-style: italic;">Toolbars</span>,
! select the 'SpamBayes' toolbar,
! and click <span style="font-style: italic;">Delete</span></li>
!     <li><span style="font-style: italic;">Restart Outlook<br>
!       </span></li>
!   </ol>
! </ul>
! If all else fails, you can completely reset the Outlook toolbars by
! removing the file <span style="font-style: italic;">\Documents and
! Settings\{username}\Application Data\Microsoft\Outlook\outcmd.dat</span>.&nbsp;
! Keep a copy of the file in case this does something nasty to your
! system (it didn't to ours, and is documented a few places on the web,
! but we make no guarantees).<br>
! <ul>
  </ul>
  <h2><a name="Messages_fail_to_filter"></a>Messages fail to filter</h2>



From mhammond at users.sourceforge.net  Tue Jun  3 20:59:06 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Tue Jun  3 22:59:11 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000 about.html,1.10,1.11
Message-ID: <E19NOUU-0001pI-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	about.html 
Log Message:
Change toolbar text (and Mozilla decided to re-wrap lots!)


Index: about.html
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/about.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** about.html	18 Mar 2003 06:27:00 -0000	1.10
--- about.html	4 Jun 2003 02:59:03 -0000	1.11
***************
*** 7,11 ****
  <h1>SpamBayes Outlook Plugin</h1>
  This plugin provides a spam filter based on statistical analysis of
! your personal mail. &nbsp;Unlike other spam detection systems, SpamBayes
  actually learns what you consider spam, and continually adapts as both
  your regular email and spam patterns change.&nbsp; There are no builtin
--- 7,12 ----
  <h1>SpamBayes Outlook Plugin</h1>
  This plugin provides a spam filter based on statistical analysis of
! your personal mail. &nbsp;Unlike other spam detection systems,
! SpamBayes
  actually learns what you consider spam, and continually adapts as both
  your regular email and spam patterns change.&nbsp; There are no builtin
***************
*** 19,23 ****
  <br>
  Bear in mind that this is an early version, and there are plenty of
! things to improve, particularly related to the initial configuration and
  training process.&nbsp; Please bear with us, and see the <a
   href="docs/troubleshooting.html">troubleshooting guide</a> should you
--- 20,25 ----
  <br>
  Bear in mind that this is an early version, and there are plenty of
! things to improve, particularly related to the initial configuration
! and
  training process.&nbsp; Please bear with us, and see the <a
   href="docs/troubleshooting.html">troubleshooting guide</a> should you
***************
*** 57,61 ****
   style="font-style: italic;">false negative</span>.&nbsp; In this case
  you can either drag the message to the Spam folder or click on the <span
!  style="font-style: italic;">Delete as Spam</span> button on the Outlook
  toolbar.&nbsp; In both cases, the message will be trained as spam and
  will be moved to the spam folder.</li>
--- 59,64 ----
   style="font-style: italic;">false negative</span>.&nbsp; In this case
  you can either drag the message to the Spam folder or click on the <span
!  style="font-style: italic;">Delete as Spam</span> button on the
! Outlook
  toolbar.&nbsp; In both cases, the message will be trained as spam and
  will be moved to the spam folder.</li>
***************
*** 65,71 ****
  be manually classified; good messages can either be dragged back to the
  inbox, or have the <span style="font-style: italic;">Recover from Spam</span>
! toolbar button clicked, while spam messages can either be dragged to the
! Spam folder or have the <span style="font-style: italic;">Delete as Spam</span>
! toobar button clicked.&nbsp; In all cases, the system will automatically
  be trained appropriately.</li>
    <li>A wanted (ham) message is moved to the Spam folder. This is known
--- 68,77 ----
  be manually classified; good messages can either be dragged back to the
  inbox, or have the <span style="font-style: italic;">Recover from Spam</span>
! toolbar button clicked, while spam messages can either be dragged to
! the
! Spam folder or have the <span style="font-style: italic;">Delete as
! Spam</span>
! toobar button clicked.&nbsp; In all cases, the system will
! automatically
  be trained appropriately.</li>
    <li>A wanted (ham) message is moved to the Spam folder. This is known
***************
*** 97,105 ****
        <ol>
          <li>Confirm the plugin is installed:<br>
! Start Outlook, and look at the standard Outlook toolbar.&nbsp; On the
! right-hand side, you should see an Anti-Spam dropdown button.&nbsp; If
! this button appears, then the plugin is correctly installed and ready to
! use.&nbsp; If the button does not appear, please see <a
!  href="docs/troubleshooting.html">the troubleshooting guide</a>.</li>
          <li>Create <span style="font-style: italic;">Spam</span> and <span
   style="font-style: italic;">Usure</span> folders<br>
--- 103,113 ----
        <ol>
          <li>Confirm the plugin is installed:<br>
! Start Outlook, select your Inbox, then look at your Outlook
! toolbar.&nbsp; Just below the standard Toolbar, you should see a new
! toolbar with an Anti-Spam
! dropdown button.&nbsp; If this button appears, then the plugin is
! correctly installed and ready to use.&nbsp; If the button does not
! appear, please see <a href="docs/troubleshooting.html">the
! troubleshooting guide</a>.</li>
          <li>Create <span style="font-style: italic;">Spam</span> and <span
   style="font-style: italic;">Usure</span> folders<br>
***************
*** 170,189 ****
          <li>While looking at an Outlook table view (like Messages),
  right-click on the line with column headers (From, Subject, To,
! Received, ...).         In the context menu that pops up, click on Field
! Chooser. A box         with title <i>Field Chooser</i> pops up.</li>
          <li>In the drop-down list at the top of the <span
   style="font-style: italic;">Field Chooser</span> window, select <span
   style="font-style: italic;">User Defined Fields</span></li>
!         <li>Below the drop-down, you         should see a rectangular
! button with a <span style="font-style: italic;">Spam</span> label . This<span
!  style="font-style: italic;"></span> should be automatically created for
  all folders managed by the system, but if it does not appear, you will
  need to add it yourself. &nbsp;To do this, perform the following steps</li>
          <ul>
!           <li>In the lower left corner of the <i>Field Chooser</i> box,
! click <i>New...</i>.  A box with title <i>New Field</i> pops up. </li>
            <li>In the <i>Name:</i> box, type Spam. </li>
            <li>In the <i>Type:</i> dropdown list, select <i>Percent</i>.
! This is the         third choice in the dropdown list.         Do not
  select any other format -- it won't work. </li>
            <li>The <i>Format:</i> select the first entry in the list -
--- 178,199 ----
          <li>While looking at an Outlook table view (like Messages),
  right-click on the line with column headers (From, Subject, To,
! Received, ...). In the context menu that pops up, click on Field
! Chooser. A box with title <i>Field Chooser</i> pops up.</li>
          <li>In the drop-down list at the top of the <span
   style="font-style: italic;">Field Chooser</span> window, select <span
   style="font-style: italic;">User Defined Fields</span></li>
!         <li>Below the drop-down, you should see a rectangular
! button with a <span style="font-style: italic;">Spam</span> label .
! This<span style="font-style: italic;"></span> should be automatically
! created for
  all folders managed by the system, but if it does not appear, you will
  need to add it yourself. &nbsp;To do this, perform the following steps</li>
          <ul>
!           <li>In the lower left corner of the <i>Field Chooser</i>
! box,
! click <i>New...</i>. A box with title <i>New Field</i> pops up. </li>
            <li>In the <i>Name:</i> box, type Spam. </li>
            <li>In the <i>Type:</i> dropdown list, select <i>Percent</i>.
! This is the third choice in the dropdown list. Do not
  select any other format -- it won't work. </li>
            <li>The <i>Format:</i> select the first entry in the list -
***************
*** 191,195 ****
  on the right.<br>
            </li>
!           <li>Click OK in the <i>New Field</i> box.  Now you're back in
  the <i>Field Chooser</i> box, with a new <span
   style="font-style: italic;">Spam</span> button shown, as the second
--- 201,205 ----
  on the right.<br>
            </li>
!           <li>Click OK in the <i>New Field</i> box. Now you're back in
  the <i>Field Chooser</i> box, with a new <span
   style="font-style: italic;">Spam</span> button shown, as the second
***************
*** 199,206 ****
          <li>Use your mouse to drag the <span
   style="font-style: italic;">Spam</span> button to the column header
! position where you want to see the Spam column.  You don't have to be
  precise here -- you can rearrange or resize the column later just by
  dragging it around. </li>
!         <li>You're done!  Close the <i>Field Chooser</i> box.</li>
        </ul>
        </td>
--- 209,216 ----
          <li>Use your mouse to drag the <span
   style="font-style: italic;">Spam</span> button to the column header
! position where you want to see the Spam column. You don't have to be
  precise here -- you can rearrange or resize the column later just by
  dragging it around. </li>
!         <li>You're done! Close the <i>Field Chooser</i> box.</li>
        </ul>
        </td>
***************
*** 222,228 ****
  Outlook's standard Automatic Formatting features can also be taught how
  to access the value of this field; for example, you could tell Outlook
! to display rows with suspected spam messages in green italic.  However,
  for whatever reason, the Outlook Rules Wizard does not allow creating
! rules based on user-defined fields.  That's why this addin supplies its
  own filtering rules.<br>
  <h2><a name="Filtering"></a>Configuring the plugin for filtering</h2>
--- 232,238 ----
  Outlook's standard Automatic Formatting features can also be taught how
  to access the value of this field; for example, you could tell Outlook
! to display rows with suspected spam messages in green italic. However,
  for whatever reason, the Outlook Rules Wizard does not allow creating
! rules based on user-defined fields. That's why this addin supplies its
  own filtering rules.<br>
  <h2><a name="Filtering"></a>Configuring the plugin for filtering</h2>
***************
*** 235,242 ****
  Once this is done, you simply enable filtering from the main dialog,
  and sit back and wait for spam!&nbsp; See <a href="#Using_the_plugin">using
! the plugin</a> for details further details.<br>
  <h2><a name="Your_help_is_needed"></a>Your help is needed!</h2>
  <p>This is free software.&nbsp; Please offer any help you are able
! to.&nbsp; In particular, contributions to this documentation are welcome!<br>
  <br>
  </p>
--- 245,253 ----
  Once this is done, you simply enable filtering from the main dialog,
  and sit back and wait for spam!&nbsp; See <a href="#Using_the_plugin">using
! the plugin</a> for further details.<br>
  <h2><a name="Your_help_is_needed"></a>Your help is needed!</h2>
  <p>This is free software.&nbsp; Please offer any help you are able
! to.&nbsp; In particular, contributions to this documentation are
! welcome!<br>
  <br>
  </p>



From mhammond at users.sourceforge.net  Wed Jun  4 02:25:56 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Wed Jun  4 04:26:01 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000/dialogs FilterDialog.py,
	1.17, 1.18
Message-ID: <E19NTam-00042Y-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	FilterDialog.py 
Log Message:
No longer default to the "Inbox", as this may mislead people with multiple
inboxes, as seen in [ 741797 ] Does not filter incoming mail.


Index: FilterDialog.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/FilterDialog.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** FilterDialog.py	18 Mar 2003 05:31:28 -0000	1.17
--- FilterDialog.py	4 Jun 2003 08:25:53 -0000	1.18
***************
*** 83,91 ****
          self.watch_folder_ids = mgr.config.filter.watch_folder_ids
          self.watch_include_sub = mgr.config.filter.watch_include_sub
!         # If we have no watch folder, suggest the Inbox.
!         if len(self.watch_folder_ids)==0 and mgr.outlook is not None:
!             inbox = self.mgr.outlook.Session.GetDefaultFolder(constants.olFolderInbox)
!             self.watch_folder_ids = [(inbox.StoreID, inbox.EntryID)]
! 
          self.spam_folder_id = mgr.config.filter.spam_folder_id
          self.unsure_folder_id = mgr.config.filter.unsure_folder_id
--- 83,90 ----
          self.watch_folder_ids = mgr.config.filter.watch_folder_ids
          self.watch_include_sub = mgr.config.filter.watch_include_sub
!         # If we have no watch folder, we used to suggest the Inbox.
!         # But this mis-lead at least one user, in the case where there are
!         # multiple inboxes - he assumed we guess the "correct" one.  Forcing
!         # the user to specify it means getting the wrong one is their fault.
          self.spam_folder_id = mgr.config.filter.spam_folder_id
          self.unsure_folder_id = mgr.config.filter.unsure_folder_id



From mhammond at users.sourceforge.net  Wed Jun  4 18:50:13 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Wed Jun  4 20:50:17 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000 filter.py,1.21,1.22
Message-ID: <E19NixJ-0007g6-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	filter.py 
Log Message:
When filtering, saving the spam score is no longer fatal - we log the
 error then continue to attempt the filter action.


Index: filter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/filter.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** filter.py	16 May 2003 03:50:56 -0000	1.21
--- filter.py	5 Jun 2003 00:50:10 -0000	1.22
***************
*** 29,41 ****
  
      try:
!         # Save the score
!         msg.SetField(mgr.config.field_score_name, prob)
!         # and the ID of the folder we were in when scored.
!         # (but only if we want to perform all actions)
!         # Note we must do this, and the Save, before the
!         # filter, else the save will fail.
!         if all_actions:
!             msg.RememberMessageCurrentFolder()
!         msg.Save()
  
          if all_actions and attr_prefix is not None:
--- 29,49 ----
  
      try:
!         try:
!             # Save the score
!             # Catch this exception, as failing to save the score need not
!             # be fatal - it may still be possible to perform the move.
!             msg.SetField(mgr.config.field_score_name, prob)
!             # and the ID of the folder we were in when scored.
!             # (but only if we want to perform all actions)
!             # Note we must do this, and the Save, before the
!             # filter, else the save will fail.
!             if all_actions:
!                 msg.RememberMessageCurrentFolder()
!             msg.Save()
!         except:
!             print "Failed to save the Spam score for message ", msg
!             import traceback
!             traceback.print_exc()
!             print "Still (possibly) atempting to move this message though..."
  
          if all_actions and attr_prefix is not None:



From anadelonbrin at users.sourceforge.net  Wed Jun  4 22:28:40 2003
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Thu Jun  5 00:28:43 2003
Subject: [Spambayes-checkins] spambayes/contrib muttrc,1.2,1.3
Message-ID: <E19NmMi-0005KZ-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	muttrc 
Log Message:
Update to reflect the new (a long time ago!) name for the
classification header, as pointed out by Alister Forbes.

Index: muttrc
===================================================================
RCS file: /cvsroot/spambayes/spambayes/contrib/muttrc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** muttrc	2 Feb 2003 18:31:44 -0000	1.2
--- muttrc	5 Jun 2003 04:28:37 -0000	1.3
***************
*** 24,26 ****
  folder-hook . "macro index H '|hammiefilter.py -g\r <save-message>!\r'"
  folder-hook . "macro pager H '|hammiefilter.py -g\r <save-message>!\r'"
! color index red black "~h 'X-Hammie-Disposition: spam' ~F"
--- 24,26 ----
  folder-hook . "macro index H '|hammiefilter.py -g\r <save-message>!\r'"
  folder-hook . "macro pager H '|hammiefilter.py -g\r <save-message>!\r'"
! color index red black "~h 'X-Spambayes-Disposition: spam' ~F"



From montanaro at users.sourceforge.net  Thu Jun  5 08:19:04 2003
From: montanaro at users.sourceforge.net (Skip Montanaro)
Date: Thu Jun  5 10:19:11 2003
Subject: [Spambayes-checkins] website faq.txt,1.2,1.3
Message-ID: <E19Nva4-0002gf-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	faq.txt 
Log Message:
Split Outlook plugin questions out from Compatibility section and add
question about marking spam as read automatically.


Index: faq.txt
===================================================================
RCS file: /cvsroot/spambayes/website/faq.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** faq.txt	2 Jun 2003 14:40:48 -0000	1.2
--- faq.txt	5 Jun 2003 14:19:01 -0000	1.3
***************
*** 240,252 ****
  
  
- What version of Outlook does it work with?
- ------------------------------------------
- 
- The most up to date list of known compatible versions of Outlook may be
- found on the `Windows page`_.
- 
- .. _Windows page: http://spambayes.sf.net/windows.html
- 
- 
  Does Spambayes work with Outlook Express?
  -----------------------------------------
--- 240,243 ----
***************
*** 269,281 ****
  
  
! Do I have to have Python installed to use Spambayes with Outlook?
! -----------------------------------------------------------------
! 
! If you use the Outlook plugin binary installer there's no need to explicitly
! install Python.
! 
! 
! Forget Outlook, what clients will Spambayes work with in general?
! -----------------------------------------------------------------
  
  Spambayes will work with most POP3 or IMAP compatible clients.  How you
--- 260,265 ----
  
  
! What clients will Spambayes work with in general?
! -------------------------------------------------
  
  Spambayes will work with most POP3 or IMAP compatible clients.  How you
***************
*** 324,327 ****
--- 308,331 ----
  
  
+ Outlook Plugin
+ ==============
+ 
+ 
+ What version(s) of Outlook does the plugin work with?
+ -----------------------------------------------------
+ 
+ The most up to date list of known compatible versions of Outlook may be
+ found on the `Windows page`_.
+ 
+ .. _Windows page: http://spambayes.sf.net/windows.html
+ 
+ 
+ Do I have to have Python installed to use Spambayes with Outlook?
+ -----------------------------------------------------------------
+ 
+ If you use the Outlook plugin binary installer there's no need to explicitly
+ install Python.
+ 
+ 
  Will Spambayes work with Outlook 2000 connecting to an Exchange 2000 server?
  ----------------------------------------------------------------------------
***************
*** 329,332 ****
--- 333,343 ----
  It should, yes.  There haven't been any problems reported using that
  combination.
+ 
+ 
+ Can mail marked as spam automatically be marked as read?
+ --------------------------------------------------------
+ 
+ This is currently not possible.  It's a known problem with an as-yet unknown
+ solution.
  
  



From montanaro at users.sourceforge.net  Thu Jun  5 09:06:27 2003
From: montanaro at users.sourceforge.net (Skip Montanaro)
Date: Thu Jun  5 11:06:45 2003
Subject: [Spambayes-checkins] spambayes hammiefilter.py,1.17,1.18
Message-ID: <E19NwJv-0003bb-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	hammiefilter.py 
Log Message:
tweak usage message to clarify which flags cause a modified message to be
emitted to stdout and wrapped one long line


Index: hammiefilter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/hammiefilter.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** hammiefilter.py	2 May 2003 04:05:12 -0000	1.17
--- hammiefilter.py	5 Jun 2003 15:06:24 -0000	1.18
***************
*** 28,34 ****
      -n
          create a new database
! *   -f
          filter (default if no processing options are given)
! *   -t
          [EXPERIMENTAL] filter and train based on the result (you must
          make sure to untrain all mistakes later)
--- 28,34 ----
      -n
          create a new database
! *+  -f
          filter (default if no processing options are given)
! *+  -t
          [EXPERIMENTAL] filter and train based on the result (you must
          make sure to untrain all mistakes later)
***************
*** 44,51 ****
          this message)
  
! All processing options (marked with *) operate on stdin.  If no
! processing options are given, stdin will be scored: the same message,
! with a new header containing the score, will be send to stdout.
! 
  """
  
--- 44,49 ----
          this message)
  
! All options marked with '*' operate on stdin.  Only those processing options
! marked with '+' send a modified message to stdout.
  """
  
***************
*** 148,152 ****
      h = HammieFilter()
      actions = []
!     opts, args = getopt.getopt(sys.argv[1:], 'hxd:D:nfgstGS', ['help', 'examples'])
      for opt, arg in opts:
          if opt in ('-h', '--help'):
--- 146,151 ----
      h = HammieFilter()
      actions = []
!     opts, args = getopt.getopt(sys.argv[1:], 'hxd:D:nfgstGS',
!                                ['help', 'examples'])
      for opt, arg in opts:
          if opt in ('-h', '--help'):



From montanaro at users.sourceforge.net  Thu Jun  5 09:13:34 2003
From: montanaro at users.sourceforge.net (Skip Montanaro)
Date: Thu Jun  5 11:13:38 2003
Subject: [Spambayes-checkins] website/scripts/ht2html Skeleton.py, 1.1.1.1,
	1.2
Message-ID: <E19NwQo-0004qX-00@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/spambayes/website/scripts/ht2html
In directory sc8-pr-cvs1:/tmp/cvs-serv18590

Modified Files:
	Skeleton.py 
Log Message:
make StringIO import technique consistent across all uses


Index: Skeleton.py
===================================================================
RCS file: /cvsroot/spambayes/website/scripts/ht2html/Skeleton.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Skeleton.py	19 Sep 2002 08:40:55 -0000	1.1.1.1
--- Skeleton.py	5 Jun 2003 15:13:31 -0000	1.2
***************
*** 10,14 ****
  import sys
  import time
! from cStringIO import StringIO
  
  
--- 10,17 ----
  import sys
  import time
! try:
!     from cStringIO import StringIO
! except ImportError:
!     from StringIO import StringIO
  
  



From montanaro at users.sourceforge.net  Thu Jun  5 09:13:57 2003
From: montanaro at users.sourceforge.net (Skip Montanaro)
Date: Thu Jun  5 11:15:21 2003
Subject: [Spambayes-checkins] website/scripts/ht2html Sidebar.py,1.2,1.3
Message-ID: <E19NwRB-0004ts-00@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/spambayes/website/scripts/ht2html
In directory sc8-pr-cvs1:/tmp/cvs-serv18814

Modified Files:
	Sidebar.py 
Log Message:
make StringIO import technique consistent across all uses


Index: Sidebar.py
===================================================================
RCS file: /cvsroot/spambayes/website/scripts/ht2html/Sidebar.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Sidebar.py	13 Jan 2003 03:57:58 -0000	1.2
--- Sidebar.py	5 Jun 2003 15:13:54 -0000	1.3
***************
*** 4,8 ****
  import sys
  from types import StringType
! from cStringIO import StringIO
  
  # a useful constant
--- 4,11 ----
  import sys
  from types import StringType
! try:
!     from cStringIO import StringIO
! except ImportError:
!     from StringIO import StringIO
  
  # a useful constant



From montanaro at users.sourceforge.net  Thu Jun  5 09:14:34 2003
From: montanaro at users.sourceforge.net (Skip Montanaro)
Date: Thu Jun  5 11:15:37 2003
Subject: [Spambayes-checkins] website/scripts make.rules,1.2,1.3
Message-ID: <E19NwRm-0004z7-00@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/spambayes/website/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv19139

Modified Files:
	make.rules 
Log Message:
all: target must be first (doh!)


Index: make.rules
===================================================================
RCS file: /cvsroot/spambayes/website/scripts/make.rules,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** make.rules	31 May 2003 01:36:13 -0000	1.2
--- make.rules	5 Jun 2003 15:14:31 -0000	1.3
***************
*** 56,63 ****
  		$(HT2HTML) $(HTFLAGS) $(HTRELDIR)/$<
  
- faq.html : faq.txt
- 		$(DUHTML) faq.txt faq.html
- 
  all: $(TARGETS)
  
  # $(TARGETS): $(HT2HTML)
--- 56,63 ----
  		$(HT2HTML) $(HTFLAGS) $(HTRELDIR)/$<
  
  all: $(TARGETS)
+ 
+ faq.html : faq.txt
+ 	$(DUHTML) faq.txt faq.html
  
  # $(TARGETS): $(HT2HTML)



From anadelonbrin at users.sourceforge.net  Thu Jun  5 16:40:42 2003
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Thu Jun  5 18:40:46 2003
Subject: [Spambayes-checkins] spambayes CHANGELOG.txt, 1.2,
	1.3 WHAT_IS_NEW.txt, 1.2, 1.3
Message-ID: <E19O3PW-0004eT-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	CHANGELOG.txt WHAT_IS_NEW.txt 
Log Message:
In changelog expand references to sf tracker items so that
both the number and the 'title' are specified.

Bring both the changelog and what's new file up to date.

Index: CHANGELOG.txt
===================================================================
RCS file: /cvsroot/spambayes/spambayes/CHANGELOG.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CHANGELOG.txt	26 May 2003 08:39:44 -0000	1.2
--- CHANGELOG.txt	5 Jun 2003 22:40:39 -0000	1.3
***************
*** 4,9 ****
  Mark Hammond	03/02/03	If a new bsddb or bsddb3 module is available use this instead of a pickle in the Outlook plugin.
  Mark Hammond	03/02/03	Add tick-marks to the filter dialog.
! Mark Hammond	03/02/03	Fix SF#677804.
! Mark Hammond	04/02/03	Fix SF#642740.
  Mark Hammond	07/02/03	Fix some errors using bsddb3 in Outlook plugin.
  Tim Stone	08/02/03	Ensure that nham and nspam are instances of integer in dbExpImp.py
--- 4,9 ----
  Mark Hammond	03/02/03	If a new bsddb or bsddb3 module is available use this instead of a pickle in the Outlook plugin.
  Mark Hammond	03/02/03	Add tick-marks to the filter dialog.
! Mark Hammond	03/02/03	Fix SF#677804 ('Untouched fitler command error').
! Mark Hammond	04/02/03	Fix SF#642740 ('"Recover from Spam" wrong folder').
  Mark Hammond	07/02/03	Fix some errors using bsddb3 in Outlook plugin.
  Tim Stone	08/02/03	Ensure that nham and nspam are instances of integer in dbExpImp.py
***************
*** 13,17 ****
  Mark Hammond	12/02/03	Check for correct exception when removing file in Outlook addin.
  Mark Hammond	12/02/03	Check for bsddb3 before bsddb (previously bsddb3 would never be found).
! Mark Hammond	13/02/03	SF#685746.
  Mark Hammond	13/02/03	Handle exceptions when opening folders in Outlook plugin better.
  Skip Montanaro	13/02/03	Split BAYESCUSTOMIZE environment variable using os.pathsep.
--- 13,17 ----
  Mark Hammond	12/02/03	Check for correct exception when removing file in Outlook addin.
  Mark Hammond	12/02/03	Check for bsddb3 before bsddb (previously bsddb3 would never be found).
! Mark Hammond	13/02/03	Add SF#685746 ('Outlook plugin folder list sorted alphabetically').
  Mark Hammond	13/02/03	Handle exceptions when opening folders in Outlook plugin better.
  Skip Montanaro	13/02/03	Split BAYESCUSTOMIZE environment variable using os.pathsep.
***************
*** 26,30 ****
  Tony Meyer	27/02/03	First check in of smtpproxy.
  T. Alexander Popiel	27/02/03	Added various files relating to incremental training (or "self training") regimes.
! Tim Stone	27/02/03	Fix SF#693423.
  T. Alexander Popiel	28/02/03	Put all regimes into regmies.py.  Define fpfnunsure and fnunsure regimes.
  T. Alexander Popiel	28/02/03	Fix name conflict between regimes list and regimes source file in incremental.py
--- 26,30 ----
  Tony Meyer	27/02/03	First check in of smtpproxy.
  T. Alexander Popiel	27/02/03	Added various files relating to incremental training (or "self training") regimes.
! Tim Stone	27/02/03	Fix SF#693423 ('email message generates error in pop3proxy.py').
  T. Alexander Popiel	28/02/03	Put all regimes into regmies.py.  Define fpfnunsure and fnunsure regimes.
  T. Alexander Popiel	28/02/03	Fix name conflict between regimes list and regimes source file in incremental.py
***************
*** 36,40 ****
  Tony Meyer	02/03/03	Added support to smtpproxy for extracting an id in a Mozilla style forwarded message (HTML table).
  Mark Hammond	03/03/03	Fix manager.py calling shutil.move (does not exist pre Python 2.3).
! Mark Hammond	03/03/03	Fix SF#696995.
  Skip Montanaro	03/03/03	Note when subject charset is invalid (rather than raising an exception).
  Mark Hammond	04/03/03	Fix a Outlook plugin bug that could cause incorrect word scores to be used/saved when a bsddb database is used.
--- 36,40 ----
  Tony Meyer	02/03/03	Added support to smtpproxy for extracting an id in a Mozilla style forwarded message (HTML table).
  Mark Hammond	03/03/03	Fix manager.py calling shutil.move (does not exist pre Python 2.3).
! Mark Hammond	03/03/03	Fix SF#696995 ('Invalid HTML comments are not ignored').
  Skip Montanaro	03/03/03	Note when subject charset is invalid (rather than raising an exception).
  Mark Hammond	04/03/03	Fix a Outlook plugin bug that could cause incorrect word scores to be used/saved when a bsddb database is used.
***************
*** 45,59 ****
  Mark Hammond	04/03/03	Only attempt to create "Spam" field on a mail item in Outlook plugin.
  Mark Hammond	04/03/03	If no items are found in Outlook plugin don't attempt to recurse folders.
! Mark Hammond	04/03/03	Fix SF#696476
! Mark Hammond	04/03/03	Fix SF#697120.
  Jeremy Hylton	04/03/03	Band-aid decode_header() in pop3proxy.py
! Tim Stone	06/03/03	Added SF#690928.
  Skip Montanaro	06/03/03	Catch extra exception in header parse errors.
! Tim Stone	06/03/03	Fix SF#698852.
  Mark Hammond	07/03/03	Handle MAPI exceptions better in Outlook plugin.
  Mark Hammond	07/03/03	Centralise detection of "not found" exceptions in Outlook plugin.
  Mark Hammond	07/03/03	Supress errors in outlook plugin when hotmail connector can't save the message.
  T. Alexander Popiel	07/03/03	Added another regime to regimes.py.
! Tim Stone	08/03/03	Fix SF#700165
  Tim Peters	08/03/03	List unique tokens one per line in Outlook plugin's ShowClues.
  Mark Hammond	09/03/03	Correct "data" directory location in export.py.
--- 45,59 ----
  Mark Hammond	04/03/03	Only attempt to create "Spam" field on a mail item in Outlook plugin.
  Mark Hammond	04/03/03	If no items are found in Outlook plugin don't attempt to recurse folders.
! Mark Hammond	04/03/03	Fix SF#696476 ('Manual filtering in outlook fails').
! Mark Hammond	04/03/03	Fix SF#697120 ('Manual filtering in Outlook (still) fails').
  Jeremy Hylton	04/03/03	Band-aid decode_header() in pop3proxy.py
! Tim Stone	06/03/03	Added SF#690928 ('turn off saving messages in popproxy').
  Skip Montanaro	06/03/03	Catch extra exception in header parse errors.
! Tim Stone	06/03/03	Fix SF#698852 ("can't classify messages").
  Mark Hammond	07/03/03	Handle MAPI exceptions better in Outlook plugin.
  Mark Hammond	07/03/03	Centralise detection of "not found" exceptions in Outlook plugin.
  Mark Hammond	07/03/03	Supress errors in outlook plugin when hotmail connector can't save the message.
  T. Alexander Popiel	07/03/03	Added another regime to regimes.py.
! Tim Stone	08/03/03	Fix SF#700165 ('MoveFileEx doesn't exist on Win98').
  Tim Peters	08/03/03	List unique tokens one per line in Outlook plugin's ShowClues.
  Mark Hammond	09/03/03	Correct "data" directory location in export.py.
***************
*** 71,75 ****
  Mark Hammond	16/03/03	Fix bug in Outlook plugin where filter operation report was reporting incorrect total.
  Mark Hammond	17/03/03	Warn, but ignore errors walking the folder tree in Outlook plugin.
! Tony Meyer	17/03/03	Fix SF#704921.
  Mark Hammond	17/03/03	Prevent a single error filtering a message from stopping the whole filter process in Outlook plugin.
  Mark Hammond	18/03/03	Ensure all buttons are greyed during filter process in Outlook plugin.
--- 71,75 ----
  Mark Hammond	16/03/03	Fix bug in Outlook plugin where filter operation report was reporting incorrect total.
  Mark Hammond	17/03/03	Warn, but ignore errors walking the folder tree in Outlook plugin.
! Mark Hammond	17/03/03	Fix SF#704921 ('"Train now" (outlook) fails ').
  Mark Hammond	17/03/03	Prevent a single error filtering a message from stopping the whole filter process in Outlook plugin.
  Mark Hammond	18/03/03	Ensure all buttons are greyed during filter process in Outlook plugin.
***************
*** 78,83 ****
  Mark Hammond	20/03/03	Ensure database is saved before testing outlook plugin.
  Mark Hammond	20/03/03	Fix error in testing outlook plugin (getting wrong end of sorted list).
! Tim Stone	20/03/03	Added SF#703283.
! Mark Hammond	23/03/03	Fix SF#707491.
  Tim Stone	28/03/03	Unicode print error fix in notesfilter.
  Tony Meyer	03/04/03	Expire messages from the unknown pop3proxy cache as well as ham/spam caches.
--- 78,83 ----
  Mark Hammond	20/03/03	Ensure database is saved before testing outlook plugin.
  Mark Hammond	20/03/03	Fix error in testing outlook plugin (getting wrong end of sorted list).
! Tim Stone	20/03/03	Added SF#703283 ('mboxtrain only trains on cur in maildir').
! Mark Hammond	23/03/03	Fix SF#707491 ('Pop3 proxy service code for Windows doesn't work...').
  Tim Stone	28/03/03	Unicode print error fix in notesfilter.
  Tony Meyer	03/04/03	Expire messages from the unknown pop3proxy cache as well as ham/spam caches.
***************
*** 145,158 ****
  Tim Stone	21/04/03	Cosmetic changes to the web configuration page.
  Skip Montanaro	21/04/03	Fix crlf regex in message.py
! Tony Meyer	21/04/03	Fix SF#725307
  Tim Stone	21/04/03	Rewrote is_valid method in Options.py
  Tony Meyer	22/04/03	Fixed is_valid method for sets.
  Tim Stone	22/04/03	Added extra verbose output in IMAP Filter.
  Tim Stone	22/04/03	Corrected counting error in IMAP Filter.
! Skip Montanaro	22/04/03	Fix SF#725616
  Tony Meyer	22/04/03	Improved processing of fetch response in IMAP filter.
! Tony Meyer	24/04/03	Fix SF#725307
! Tony Meyer	24/04/03	Fix SF#725466
! Tony Meyer	24/04/03	Fix SF#726255
  Tony Meyer	24/04/03	Moved the crlf fixing from generic message class to IMAP filter.
  Tony Meyer	24/04/03	Major rewrite of Options.py
--- 145,158 ----
  Tim Stone	21/04/03	Cosmetic changes to the web configuration page.
  Skip Montanaro	21/04/03	Fix crlf regex in message.py
! Tony Meyer	21/04/03	Fix SF#725307 ('Outlook plugin won't load (anymore)').
  Tim Stone	21/04/03	Rewrote is_valid method in Options.py
  Tony Meyer	22/04/03	Fixed is_valid method for sets.
  Tim Stone	22/04/03	Added extra verbose output in IMAP Filter.
  Tim Stone	22/04/03	Corrected counting error in IMAP Filter.
! Tony Meyer	22/04/03	Fix SF#725616 ('Options.py mergefiles crashes (+ fix)').
  Tony Meyer	22/04/03	Improved processing of fetch response in IMAP filter.
! Tony Meyer	24/04/03	Fix SF#725307 ("Outlook plugin won't load (anymore)").
! Tony Meyer	24/04/03	Fix SF#725466 ('Include a proper locale fix in Options.py').
! Tony Meyer	24/04/03	Fix SF#726255 ('Problem if bayescustomize.ini not there').
  Tony Meyer	24/04/03	Moved the crlf fixing from generic message class to IMAP filter.
  Tony Meyer	24/04/03	Major rewrite of Options.py
***************
*** 176,180 ****
  Tony Meyer	28/04/03	Fix SelectFolder bug in IMAP Filter.
  Tim Stone	28/04/03	Create IMAP session object for each login.
! Tony Meyer	28/04/03	Fix for SF#728886.
  Tony Meyer	28/04/03	Fix for incorrect is_boolean code in Options.py
  Tony Meyer	28/04/03	IMAP Filter now only retrieves RFC822 headers when iterating, not whole message.
--- 176,180 ----
  Tony Meyer	28/04/03	Fix SelectFolder bug in IMAP Filter.
  Tim Stone	28/04/03	Create IMAP session object for each login.
! Tony Meyer	28/04/03	Fix for SF#728886 ('In the pop3 UI not able to pass more than 1 server').
  Tony Meyer	28/04/03	Fix for incorrect is_boolean code in Options.py
  Tony Meyer	28/04/03	IMAP Filter now only retrieves RFC822 headers when iterating, not whole message.
***************
*** 194,198 ****
  Tony Meyer	03/05/03	Removed OptionConfig.py
  Mark Hammond	03/05/03	Correct usage doc with respect to default directory.
! Mark Hammond	03/05/03	Fix SF#715248
  Mark Hammond	03/05/03	Formalised error reporting in Outlook plugin.
  Mark Hammond	03/05/03	Created special handling for "startup errors" in Outlook plugin
--- 194,198 ----
  Tony Meyer	03/05/03	Removed OptionConfig.py
  Mark Hammond	03/05/03	Correct usage doc with respect to default directory.
! Mark Hammond	03/05/03	Fix SF#715248 ('Pickle classifier should save to a temp file first').
  Mark Hammond	03/05/03	Formalised error reporting in Outlook plugin.
  Mark Hammond	03/05/03	Created special handling for "startup errors" in Outlook plugin
***************
*** 205,209 ****
  Tony Meyer	06/05/03	IMAP Filter now deletes existing spambayes headers before training.
  Tony Meyer	06/05/03	Added "Storage":"messageinfo_storage_file" option.
! Tony Meyer	06/05/03	Fix for SF#733247.
  Tony Meyer	11/05/03	Fixed KeyError bug in message.py.
  Tony Meyer	11/05/03	Added SSL support to imapfilter (untested).
--- 205,209 ----
  Tony Meyer	06/05/03	IMAP Filter now deletes existing spambayes headers before training.
  Tony Meyer	06/05/03	Added "Storage":"messageinfo_storage_file" option.
! Tony Meyer	06/05/03	Fix for SF#733247 ('crash when using merged-in options').
  Tony Meyer	11/05/03	Fixed KeyError bug in message.py.
  Tony Meyer	11/05/03	Added SSL support to imapfilter (untested).
***************
*** 212,221 ****
  Tony Meyer	13/05/03	Added "html_ui":"display_to" option.
  Mark Hammond	14/05/03	Various changes to urlslurper.py
! Mark Hammond	14/05/03	Fix SF#737956
! Mark Hammond	14/05/03	Fix SF#737955
  Tony Meyer	14/05/03	Added missing import to UserInterface.py
  Tony Meyer	14/05/03	Increased efforts to stop browsers caching the interface pages.
  Mark Hammond	15/05/03	The training dialog now shows a correct progress bar for the *complete* operation - training *and* scoring
! Mark Hammond	15/05/03	Fix SF#706170
  Mark Hammond	15/05/03	Save bsddb databases after a training operation (should prevent Outlook ever saving at shutdown).
  Mark Hammond	15/05/03	Print how long each save takes (so people can complain).
--- 212,221 ----
  Tony Meyer	13/05/03	Added "html_ui":"display_to" option.
  Mark Hammond	14/05/03	Various changes to urlslurper.py
! Mark Hammond	14/05/03	Fix SF#737956 ('No hourglass when building folder lists').
! Mark Hammond	14/05/03	Fix SF#737955 ('Transient connection error disables plugin').
  Tony Meyer	14/05/03	Added missing import to UserInterface.py
  Tony Meyer	14/05/03	Increased efforts to stop browsers caching the interface pages.
  Mark Hammond	15/05/03	The training dialog now shows a correct progress bar for the *complete* operation - training *and* scoring
! Mark Hammond	15/05/03	Fix SF#706170 ('Execute test suite fails in Outlook').
  Mark Hammond	15/05/03	Save bsddb databases after a training operation (should prevent Outlook ever saving at shutdown).
  Mark Hammond	15/05/03	Print how long each save takes (so people can complain).
***************
*** 230,233 ****
  Tim Peters	25/05/03	Restore __slots__ declaration to WordInfo object in classifier.py
  Tim Peters	25/05/03	PickledClassifier.load():  use getstate/setstate to copy the state. 
! Tony Meyer	26/05/03	Fix SF#737986
  Tony Meyer	26/05/03	Restore notate_to and notate_subject functionality to pop3proxy.
--- 230,245 ----
  Tim Peters	25/05/03	Restore __slots__ declaration to WordInfo object in classifier.py
  Tim Peters	25/05/03	PickledClassifier.load():  use getstate/setstate to copy the state. 
! Tony Meyer	26/05/03	Fix SF#737986 ('Message.as_string() fails.').
  Tony Meyer	26/05/03	Restore notate_to and notate_subject functionality to pop3proxy.
+ Mark Hammond    29/05/03    DB classifier keeps a list of "changed words" to prevent saves from updating *all* words.
+ Mark Hammond    29/05/03    DB classifier doesn't cache hapaxes.
+ Mark Hammond    03/06/03    Handle malformed messages better in the Outlook plugin.
+ Mark Hammond    03/06/03    In Outlook plugin, create our own toolbar, rather than using the standard one.
+ Mark Hammond    03/06/03    Fix an Outlook plugin error that would try to save the database when classifying.
+ Mark Hammond    03/06/03    Make Outlook plugin log refer to "Spambayes" rather than "SpamAddin"
+ Mark Hammond    03/06/03    Use 'wait' cursor when incremental training in Outlook plugin.
+ Mark Hammond    03/06/03    In Outlook plugin, save config when dialog closes and not at shutdown.
+ Mark Hammond    03/06/03    Clean up toolbar images.
+ Mark Hammond    04/06/03    In Outlook plugin, no longer default to the "Inbox" (see also SF#741797 ('Does not filter incoming mail')).
+ Mark Hammond    04/06/03    In Outlook plugin, when filtering, saving the spam score is no longer fatal.
+ Tony Meyer  04/06/03    In muttrc, fix incorrect Spambayes header name.

Index: WHAT_IS_NEW.txt
===================================================================
RCS file: /cvsroot/spambayes/spambayes/WHAT_IS_NEW.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WHAT_IS_NEW.txt	26 May 2003 08:39:44 -0000	1.2
--- WHAT_IS_NEW.txt	5 Jun 2003 22:40:40 -0000	1.3
***************
*** 27,30 ****
--- 27,37 ----
   o Plugin *may* now work correctly in non-English locales.
   o Databases are saved after any training operation.
+  o Handle malformed messages better in the Outlook plugin.
+  o In Outlook plugin, create our own toolbar, rather than using the standard one.
+  o Use 'wait' cursor when incremental training in Outlook plugin.
+  o In Outlook plugin, save config when dialog closes and not at shutdown.
+  o Clean up toolbar images.
+  o In Outlook plugin, no longer default to the "Inbox".
+  o In Outlook plugin, when filtering, saving the spam score is no longer fatal.
  
  POP3 Proxy
***************
*** 90,93 ****
--- 97,103 ----
     yo&#117;r se<!XE>p&#116;ic sys&#116;em becomes "your septic system".
   o <p> and <br> tags are replaced with single blanks.
+  o DB classifier keeps a list of "changed words" to prevent saves from updating *all* words.
+  o DB classifier no longer caches hapaxes.
+  o In muttrc, fix incorrect Spambayes header name.
  
  



From anadelonbrin at users.sourceforge.net  Thu Jun  5 16:57:44 2003
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Thu Jun  5 18:57:48 2003
Subject: [Spambayes-checkins] spambayes POP3PROXY.txt,1.2,1.3
Message-ID: <E19O3g0-0006qG-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	POP3PROXY.txt 
Log Message:
De-html-ise this text file, plus sundry cleanup.

Index: POP3PROXY.txt
===================================================================
RCS file: /cvsroot/spambayes/spambayes/POP3PROXY.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** POP3PROXY.txt	27 Mar 2003 04:19:41 -0000	1.2
--- POP3PROXY.txt	5 Jun 2003 22:57:40 -0000	1.3
***************
*** 1,86 ****
! <h3>For MacOS 9</h3>
! <h4>before anything</h4>
! <p>Due to MacOS multitasking, the popproxy does not work very fast. On a
! Cube 
! or a  G4 400, I found it usable but not much. YMMV.
! To handle network connection to <em>localhost</em> it is easier to add a
! host file. If you don't have one already, create one with any text editor.</p>
! <p>Its name must be "hosts". It should be located in the "Preference" folder.
! Its content should be similar to:
! <pre>
! localhost CNAME yourmac.example.com
! yourmac.example.com A 127.0.0.1
! </pre></p>
! <p>The localhost and 127.0.0.1 values must be exactly like this. If you
! don't 
! know the right value to use for yourmac.example.com, put
! anything that looks like this. The end of the first line must be the same as
! the beginning of the second line.</p>
! <p>When this file is created, go to the "TCP/IP" control panel. Set the user level
! to Administrator. Click on "Use a host file" and select this file. Save
! your changes.</p>
! <p>On the Mac, you can transform a Python script into a double-clickable
  applet. Just drag & drop the pop3proxy.py script onto the BuildApplet
! application. You'll get a double-clickable pop3proxy application.</p>
! <p>Start pop3proxy and open up a web browser to http://localhost:8880.
! Click on the Configuration link.</p>
! <p>Ensure that the servers line looks like:
! <pre>
! pop3proxy_servers: pop.videotron.ca:110,mail.ulaval.ca:110
! </pre>
! And that the ports line looks like:
! <pre>
! pop3proxy_ports: 110, 6111
! </pre>
! <h4>Configuring Entourage</h4>
! <p>
! <ul>
! <li>Go to the Tools menu and choose Accounts.</li>
! <li>Click on New and choose POP.</li>
! <li>Fill in the various fields. For the POP server field, put "localhost".</li>
! <li>For the videotron account, you are done.</li>
! <li>For the ulaval account,  in the "Advance receive option" windows click on
! the "Ignore the default POP port" check box and type in 6111.</li>
! </ul>
! </p>
! <h4>Filtering with Entourage</h4>
! <p>The rule can be:
! <pre>
! If
!     Specific header: X-Spambayes-Classification Contains ham
! then    
!     do nothing
! If
!     Specific header: X-Spambayes-Classification Contains spam
! then    
!     Move message to folder Spam
! If
!     Specific header: X-Spambayes-Classification Contains unsure
! then    
!     Move message to folder Unsure
! </pre>
  
! <h4>Configuring Eudora</h4>
! <p>In Eudora, you will be able to reach only one pop server, since you can
  configure only one port number for POP. But on this server, you can access
! more than one account.</p>
! <p>Go to the Tool menu and choose Personalities.</p>
! <p>Create an new personality with the POP server as "localhost".</p>
! <p>With the proposed "bayescustomize.ini" you will be able to talk only to
! the videotron server.</p>
! <h4>Filtering with Eudora</h4>
! <p>The rule can be:
! <pre>
! Match
!     Header: X-Spambayes-Classification contains ham
! Action    
!     do nothing
! Match
!     Header: X-Spambayes-Classification contains spam
! Action    
!     Transfer To Spam
! Match
!     Header: X-Spambayes-Classification contains unsure
! Action    
!     Transfer To Unsure
! </pre>
\ No newline at end of file
--- 1,79 ----
! Additional Information about using the POP3 Proxy.
! ==================================================
! 
! For MacOS 9
! -----------
! As a result of the MacOS multitasking, the proxy may not work very fast
! (reports suggest that at least a Cube or G4 400 is necessary; YMMV).
! 
! To handle a network connection to 'localhost', it is easiest to add a host
! file.  If you don't have one already, create a text file called "hosts" in
! the "Preferences" folder.  The content of the file should be:
! 	localhost CNAME yourmac.example.com
! 	yourmac.example.com	A 127.0.0.1
! The localhost and 127.0.0.1 values must be exactly like this.  If you don't
! know the right value to use for "yourmac.example.com", put anything that
! looks like this.  The end of the first line must be the same as the start of
! the second line.
! When this file is created, go to the "TCP/IP" control panl.  Set the user
! level to 'Administrator'.  Click on "Use a host file" and select this file.
! Save your changes.
! 
! On the Mac, you can transform a Python script into a double-clickable
  applet. Just drag & drop the pop3proxy.py script onto the BuildApplet
! application. You'll get a double-clickable pop3proxy application.
  
! To setup:
!   1. Start pop3proxy and open up a web browser to http://localhost:8880.
!   2. Click on the Configuration link.
!   3. Ensure that the servers line looks like:
! 	pop3proxy_servers: pop.example.com:110,mail.example.com:110
!   4. And that the ports line looks like:
! 	pop3proxy_ports: 110, 111
! 
! To configure Entourage:
!   1. Go to the 'Tools' menu and choose 'Accounts'.
!   2. Click on 'New' and choose 'POP'.
!   3. Fill in the various fields. For the POP server field, put "localhost".
!   4. For the pop.example.com account, you are done.
!   5. For the mail.example.com account,  in the "Advance receive option"
!      window click on the "Ignore the default POP port" check box and type
!      in 111.
! 
! To filter with Entourage:
! The rule can be:
! 	If
! 	    Specific header: X-Spambayes-Classification Contains ham
! 	then    
! 	    do nothing
! 	If
! 	    Specific header: X-Spambayes-Classification Contains spam
! 	then    
! 	    Move message to folder Spam
! 	If
! 	    Specific header: X-Spambayes-Classification Contains unsure
! 	then    
! 	    Move message to folder Unsure
! 
! To configure Eudora:
! In Eudora, you will be able to reach only one pop server, since you can
  configure only one port number for POP. But on this server, you can access
! more than one account.
!   1. Go to the 'Tools' menu and choose 'Personalities'.
!   2. Create a new personality with the POP server as "localhost".
!   Note: You will be able to talk only to the pop.example.com server.
! 
! To filter with Eudora:
! The rule can be:
! 	Match
! 	    Header: X-Spambayes-Classification contains ham
! 	Action    
! 	    do nothing
! 	Match
! 	    Header: X-Spambayes-Classification contains spam
! 	Action    
! 	    Transfer To Spam
! 	Match
! 	    Header: X-Spambayes-Classification contains unsure
! 	Action    
! 	    Transfer To Unsure



From anadelonbrin at users.sourceforge.net  Thu Jun  5 17:02:31 2003
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Thu Jun  5 19:02:33 2003
Subject: [Spambayes-checkins] spambayes FAQ.txt,1.5,NONE
Message-ID: <E19O3kd-0007pJ-00@sc8-pr-cvs1.sourceforge.net>

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

Removed Files:
	FAQ.txt 
Log Message:
The up-to-date FAQ is in the 'website' repository, and it doesn't seem to
make much sense to have multiple copies.

(However, some sort of packaged documentation, including the FAQ,
would be good to include with releases...some of this is in the main
repository, some is in the website one)

--- FAQ.txt DELETED ---



From mhammond at users.sourceforge.net  Thu Jun  5 21:57:21 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Thu Jun  5 23:57:26 2003
Subject: [Spambayes-checkins] spambayes/spambayes Version.py,NONE,1.1
Message-ID: <E19O8Lx-00018f-00@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	Version.py 
Log Message:
First pass at a version information repository.


--- NEW FILE: Version.py ---
"""Simple version repository for SpamBayes core, and our main apps"""

# This module is part of the spambayes project, which is Copyright 2002-3
# The Python Software Foundation and is covered by the Python Software
# Foundation license.
versions = {
    # Non app specific - changed when "spambayes\*" changes significantly
    "Version":          0.1,
    "Description":      "SpamBayes Beta1",
    "Date":             "June 2003",
    "Full Description": "%(Description)s, version %(Version)s (%(Date)s)",
    # Sub-dict for application specific version strings.
    "Apps": {
        "Outlook" : {
            "Version":          0.3,
            "BinaryVersion":    003,
            "Description":      "SpamBayes Outlook Addin Beta1",
            "Date":             "June 2003",
            "Full Description": "%(Description)s, version %(Version)s (%(Date)s)",
            "Full Description Binary":
                                "%(Description)s, Binary version %(BinaryVersion)s (%(Date)s)",
        },
    },
}

def get_version_string(app = None, description_key = "Full Description"):
    """Get a pretty version string, generally just to log or show in a UI"""
    if app is None:
        dict = versions
    else:
        dict = versions["Apps"][app]
    return dict[description_key] % dict

def get_version_number(app = None, version_key = "Version"):
    """Get a version number, as a float.  This would primarily be used so some
    app or extension can determine if we are later than a specific version
    of either the engine or a specific app.
    Maybe YAGNI.
    """
    if app is None:
        dict = versions
    else:
        dict = versions["Apps"][app]
    return dict[version_key]

if __name__=='__main__':
    print "SpamBayes version is:", get_version_string()
    # Enumerate applications
    print
    print "Application versions:"
    for app in versions["Apps"]:
        print "%s: %s" % (app, get_version_string(app))



From mhammond at users.sourceforge.net  Thu Jun  5 22:01:54 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Fri Jun  6 00:02:00 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000 addin.py,1.58,1.59
Message-ID: <E19O8QM-0001XZ-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	addin.py 
Log Message:
Change the "description" and "friendly name" of the addin.  Print our
new version info at startup.


Index: addin.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/addin.py,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** addin.py	4 Jun 2003 02:45:14 -0000	1.58
--- addin.py	6 Jun 2003 04:01:51 -0000	1.59
***************
*** 705,709 ****
          # automatically disabled by Outlook.
          # Our error reporter is in the "manager" module, so we get that first
-         print "SpamBayes - Connecting to Outlook"
          import manager
          try:
--- 705,708 ----
***************
*** 715,718 ****
--- 714,723 ----
              self.manager.addin = self
      
+             # Only now will the import of "spambayes.Version" work, as the
+             # manager is what munges sys.path for us.
+             from spambayes.Version import get_version_string
+             print "%s starting (with engine %s)..." % \
+                     (get_version_string("Outlook"), get_version_string())
+ 
              explorers = application.Explorers
              # and Explorers events so we know when new explorers spring into life.
***************
*** 801,805 ****
                      new_hooks[msgstore_folder.id] = new_hook
                      self.manager.EnsureOutlookFieldsForFolder(msgstore_folder.GetID())
!                     print "AntiSpam: Watching for new messages in folder ", name
              else:
                  new_hooks[msgstore_folder.id] = existing
--- 806,810 ----
                      new_hooks[msgstore_folder.id] = new_hook
                      self.manager.EnsureOutlookFieldsForFolder(msgstore_folder.GetID())
!                     print "SpamBayes: Watching for new messages in folder ", name
              else:
                  new_hooks[msgstore_folder.id] = existing
***************
*** 847,852 ****
      _winreg.SetValueEx(subkey, "CommandLineSafe", 0, _winreg.REG_DWORD, 0)
      _winreg.SetValueEx(subkey, "LoadBehavior", 0, _winreg.REG_DWORD, 3)
!     _winreg.SetValueEx(subkey, "Description", 0, _winreg.REG_SZ, klass._reg_progid_)
!     _winreg.SetValueEx(subkey, "FriendlyName", 0, _winreg.REG_SZ, klass._reg_progid_)
  
  def UnregisterAddin(klass):
--- 852,857 ----
      _winreg.SetValueEx(subkey, "CommandLineSafe", 0, _winreg.REG_DWORD, 0)
      _winreg.SetValueEx(subkey, "LoadBehavior", 0, _winreg.REG_DWORD, 3)
!     _winreg.SetValueEx(subkey, "Description", 0, _winreg.REG_SZ, "SpamBayes anti-spam tool")
!     _winreg.SetValueEx(subkey, "FriendlyName", 0, _winreg.REG_SZ, "SpamBayes")
  
  def UnregisterAddin(klass):



From mhammond at users.sourceforge.net  Thu Jun  5 22:02:29 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Fri Jun  6 00:02:32 2003
Subject: [Spambayes-checkins] 
	spambayes/Outlook2000/dialogs ManagerDialog.py, 1.9, 1.10
Message-ID: <E19O8Qv-0001b8-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	ManagerDialog.py 
Log Message:
Add the version to the main Manager dialog (and change the title to 
"SpamBayes"


Index: ManagerDialog.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/ManagerDialog.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ManagerDialog.py	27 Nov 2002 05:49:56 -0000	1.9
--- ManagerDialog.py	6 Jun 2003 04:02:26 -0000	1.10
***************
*** 28,31 ****
--- 28,32 ----
  IDC_TRAINING_STATUS = 1032
  IDC_FILTER_STATUS = 1033
+ IDC_VERSION = 1034
  
  class ManagerDialog(dialog.Dialog):
***************
*** 38,69 ****
      dt = [
          # Dialog itself.
!         ["Anti-Spam", (0, 0, 242, 191), style, None, (8, "MS Sans Serif")],
          # Training
!         [BUTTON,          "Training",           -1,                  (8,7,227,103), cs   | win32con.BS_GROUPBOX],
!         [STATIC,          training_intro,       -1,                  (15,17,215,17), cs],
          [STATIC,          "Automatically train that a message is good when",
!                                                 -1,                  (15,40,208,10), cs],
          [BUTTON,          "It is moved from a spam folder back to the Inbox",
!                                                 IDC_BUT_TRAIN_FROM_SPAM_FOLDER,(20,50,204,9), csts | win32con.BS_AUTOCHECKBOX],
  
          [STATIC,          "Automatically train that a message is spam when",
!                                                 -1,                  (15,64,208,10), cs],
          [BUTTON,          "It is moved to the certain-spam folder",
!                                                 IDC_BUT_TRAIN_TO_SPAM_FOLDER,(20,75,204,9), csts | win32con.BS_AUTOCHECKBOX],
  
!         [STATIC,          "",                   IDC_TRAINING_STATUS, (15,88,146,14),       cs   | win32con.SS_LEFTNOWORDWRAP | win32con.SS_CENTERIMAGE | win32con.SS_SUNKEN],
!         [BUTTON,          'Train Now...',       IDC_BUT_TRAIN_NOW,   (167,88,63,14),       csts | win32con.BS_PUSHBUTTON],
  
          # Filter
!         [BUTTON,          "Filtering",          -1,                   (7,112,228,57), cs   | win32con.BS_GROUPBOX],
!         [STATIC,          filtering_intro,      -1,                   (15,121,202,8), cs],
!         [BUTTON,          'Enable &filtering',  IDC_BUT_FILTER_ENABLE,(20,133,120,11),csts | win32con.BS_AUTOCHECKBOX],
!         [STATIC,          "",                   IDC_FILTER_STATUS,    (15,147,146,18),cs   | win32con.SS_SUNKEN],
!         [BUTTON,          'Filter Now...',      IDC_BUT_FILTER_NOW,   (167,131,63,14),   csts | win32con.BS_PUSHBUTTON],
!         [BUTTON,          'Define filters...',  IDC_BUT_FILTER_DEFINE,(167,150,63,14),csts | win32con.BS_PUSHBUTTON],
  
!         [BUTTON,         'Advanced...',         IDC_BUT_ADVANCED,     (15,174,62,14), csts | win32con.BS_PUSHBUTTON | win32con.WS_DISABLED],
!         [BUTTON,         'About...',            IDC_BUT_ABOUT,        (99,174,62,14), csts | win32con.BS_PUSHBUTTON],
!         [BUTTON,         'Close',               win32con.IDOK,        (167,174,62,14),csts | win32con.BS_DEFPUSHBUTTON],
      ]
  
--- 39,71 ----
      dt = [
          # Dialog itself.
!         ["SpamBayes", (0, 0, 242, 201), style, None, (8, "MS Sans Serif")],
!         [STATIC,          "",                   IDC_VERSION,         (8,4,230,11),   cs | win32con.SS_LEFTNOWORDWRAP],
          # Training
!         [BUTTON,          "Training",           -1,                  (8,17,227,103), cs   | win32con.BS_GROUPBOX],
!         [STATIC,          training_intro,       -1,                  (15,27,215,17), cs],
          [STATIC,          "Automatically train that a message is good when",
!                                                 -1,                  (15,50,208,10), cs],
          [BUTTON,          "It is moved from a spam folder back to the Inbox",
!                                                 IDC_BUT_TRAIN_FROM_SPAM_FOLDER,(20,60,204,9), csts | win32con.BS_AUTOCHECKBOX],
  
          [STATIC,          "Automatically train that a message is spam when",
!                                                 -1,                  (15,74,208,10), cs],
          [BUTTON,          "It is moved to the certain-spam folder",
!                                                 IDC_BUT_TRAIN_TO_SPAM_FOLDER,(20,85,204,9), csts | win32con.BS_AUTOCHECKBOX],
  
!         [STATIC,          "",                   IDC_TRAINING_STATUS, (15,98,146,14),       cs   | win32con.SS_LEFTNOWORDWRAP | win32con.SS_CENTERIMAGE | win32con.SS_SUNKEN],
!         [BUTTON,          'Train Now...',       IDC_BUT_TRAIN_NOW,   (167,98,63,14),       csts | win32con.BS_PUSHBUTTON],
  
          # Filter
!         [BUTTON,          "Filtering",          -1,                   (7,122,228,57), cs   | win32con.BS_GROUPBOX],
!         [STATIC,          filtering_intro,      -1,                   (15,131,202,8), cs],
!         [BUTTON,          'Enable &filtering',  IDC_BUT_FILTER_ENABLE,(20,143,120,11),csts | win32con.BS_AUTOCHECKBOX],
!         [STATIC,          "",                   IDC_FILTER_STATUS,    (15,157,146,18),cs   | win32con.SS_SUNKEN],
!         [BUTTON,          'Filter Now...',      IDC_BUT_FILTER_NOW,   (167,141,63,14),   csts | win32con.BS_PUSHBUTTON],
!         [BUTTON,          'Define filters...',  IDC_BUT_FILTER_DEFINE,(167,160,63,14),csts | win32con.BS_PUSHBUTTON],
  
!         #[BUTTON,         'Advanced...',         IDC_BUT_ADVANCED,     (15,184,62,14), csts | win32con.BS_PUSHBUTTON | win32con.WS_DISABLED ],
!         [BUTTON,         'About...',            IDC_BUT_ABOUT,        (99,184,62,14), csts | win32con.BS_PUSHBUTTON],
!         [BUTTON,         'Close',               win32con.IDOK,        (167,184,62,14),csts | win32con.BS_DEFPUSHBUTTON],
      ]
  
***************
*** 85,88 ****
--- 87,96 ----
  
      def OnInitDialog(self):
+         from spambayes.Version import get_version_string
+         version_key = "Full Description"
+         if hasattr(sys, "frozen"):
+             version_key += " Binary"
+         self.SetDlgItemText(IDC_VERSION, get_version_string("Outlook", version_key))
+         
  ##        self.HookCommand(self.OnButAdvanced, IDC_BUT_ADVANCED)
          self.HookCommand(self.OnButAbout, IDC_BUT_ABOUT)



From npickett at users.sourceforge.net  Fri Jun  6 11:08:15 2003
From: npickett at users.sourceforge.net (Neale Pickett)
Date: Fri Jun  6 13:08:22 2003
Subject: [Spambayes-checkins] spambayes INTEGRATION.txt,1.8,1.9
Message-ID: <E19OKhL-0008Sv-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	INTEGRATION.txt 
Log Message:
Integrated Prabhu Ramachandran's code for the VM mailer


Index: INTEGRATION.txt
===================================================================
RCS file: /cvsroot/spambayes/spambayes/INTEGRATION.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** INTEGRATION.txt	17 Apr 2003 00:41:30 -0000	1.8
--- INTEGRATION.txt	6 Jun 2003 17:08:12 -0000	1.9
***************
*** 333,363 ****
  
  
! X/Emacs+VM
! ----------
! 
! Emacs and XEmacs both come with VM, one of a choice of several Emacs-based
! mail packages.  Emacs is extensible using Emacs Lisp or Pymacs.  This
! extensibility allows you to easily segregate your incoming mail for training
! purposes.  Here's one such example.  If you place the following code in your
! ~/.vm file:
! 
!     (defun copy-to-spam ()
!       (interactive)
!       (vm-save-message (expand-file-name "~/tmp/newspam"))
!       (vm-undelete-message 1))
! 
!     (defun copy-to-nonspam ()
!       (interactive)
!       (vm-save-message (expand-file-name "~/tmp/newham"))
!       (vm-undelete-message 1))
  
!     (define-key vm-mode-map "ls" 'copy-to-spam)
!     (define-key vm-summary-mode-map "ls" 'copy-to-spam)
!     (define-key vm-mode-map "lh" 'copy-to-nonspam)
!     (define-key vm-summary-mode-map "lh" 'copy-to-nonspam)
  
- 'ls' will save a copy of the current message to ~/tmp/newspam and 'lh' will
- save a copy of the current message to ~/tmp/newham.  You can then use those
- files later as arguments to hammie.py for training.
  
  
--- 333,343 ----
  
  
! VM and Gnus
! -----------
  
! VM and Gnus are mail readers distributed with Emacs and XEmacs.  The
! spambayes.el file in the contrib directory contains code and
! instructions for VM and Gnus integration.
  
  
  



From npickett at users.sourceforge.net  Fri Jun  6 11:08:15 2003
From: npickett at users.sourceforge.net (Neale Pickett)
Date: Fri Jun  6 13:08:23 2003
Subject: [Spambayes-checkins] spambayes/contrib spambayes.el,1.2,1.3
Message-ID: <E19OKhL-0008T0-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	spambayes.el 
Log Message:
Integrated Prabhu Ramachandran's code for the VM mailer


Index: spambayes.el
===================================================================
RCS file: /cvsroot/spambayes/spambayes/contrib/spambayes.el,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** spambayes.el	27 Jan 2003 21:12:47 -0000	1.2
--- spambayes.el	6 Jun 2003 17:08:13 -0000	1.3
***************
*** 1,5 ****
! ;; spambayes.el -- integrate spambayes into Gnus
  ;; Copyright (C) 2003 Neale Pickett <neale@woozle.org>
! ;; Time-stamp: <2003-01-27 13:12:14 neale>
  
  ;; This is free software; you can redistribute it and/or modify it under
--- 1,5 ----
! ;; spambayes.el -- integrate spambayes into Gnus and VM
  ;; Copyright (C) 2003 Neale Pickett <neale@woozle.org>
! ;; Time-stamp: <2003-06-06 10:07:09 neale>
  
  ;; This is free software; you can redistribute it and/or modify it under
***************
*** 38,41 ****
--- 38,44 ----
  ;; Installation:
  ;;
+ ;;
+ ;; GNUS
+ ;; ----
  ;; To install, just drop this file in your load path, and insert the
  ;; following lines in ~/.gnus:
***************
*** 45,51 ****
  ;;  'gnus-sum-load-hook
  ;;  (lambda nil
! ;;    (define-key gnus-summary-mode-map [(B) (s)] 'spambayes-refile-as-spam)
! ;;    (define-key gnus-summary-mode-map [(B) (h)] 'spambayes-refile-as-ham)))
  ;;
  
  (defvar spambayes-spam-group "spam"
--- 48,85 ----
  ;;  'gnus-sum-load-hook
  ;;  (lambda nil
! ;;    (define-key gnus-summary-mode-map [(B) (s)] 'spambayes-gnus-refile-as-spam)
! ;;    (define-key gnus-summary-mode-map [(B) (h)] 'spambayes-gnus-refile-as-ham)))
! ;;
! ;;
! ;; VM (Courtesy of Prabhu Ramachandran <prabhu@aero.iitm.ernet.in>)
! ;; ----
! ;; Put the following in ~/.vm:
! ;;
! ;; (load-library "spambayes")
  ;;
+ ;; This binds "l h" to retrain processable messages as ham and "l s"
+ ;; to retrain them as spam.
+ ;; (define-key vm-mode-map "ls" 'spambayes-vm-retrain-as-spam)
+ ;; (define-key vm-summary-mode-map "ls" 'spambayes-vm-retrain-as-spam)
+ ;; (define-key vm-mode-map "lh" 'spambayes-vm-retrain-as-ham)
+ ;; (define-key vm-summary-mode-map "lh" 'spambayes-vm-retrain-as-ham)
+ ;;
+ ;; (setq vm-auto-folder-alist
+ ;;       '(("X-Spambayes-Classification:" ("spam" . "~/vmmail/SPAM"))
+ ;;         ("X-Spambayes-Classification:" ("unsure" . "~/vmmail/UNSURE"))
+ ;;         )
+ ;; )
+ ;; 
+ ;; Hitting the 'A' key will refile messages to the SPAM and UNSURE folders.
+ ;;
+ ;; The following visible header list might also be useful:
+ ;; (setq vm-visible-headers
+ ;;    '("Resent-"
+ ;;      "From:" "Sender:" "Reply-To:"
+ ;;      "To:" "Apparently-To:" "Cc:"
+ ;;      "Subject:"
+ ;;      "Date:"
+ ;;      "X-Spambayes-Classification:"))
+ 
  
  (defvar spambayes-spam-group "spam"
***************
*** 55,59 ****
    "Path to the hammiefilter program")
  
! (defun spambayes-retrain (is-spam)
    "Retrain on all processable articles, or the one under the cursor.
  
--- 89,95 ----
    "Path to the hammiefilter program")
  
! ;; Gnus
! 
! (defun spambayes-gnus-retrain (is-spam)
    "Retrain on all processable articles, or the one under the cursor.
  
***************
*** 89,93 ****
  	  (do-exec n group is-spam))))))
  
! (defun spambayes-refile-as-spam ()
    "Retrain and refilter all process-marked messages as spam, then respool them"
    (interactive)
--- 125,129 ----
  	  (do-exec n group is-spam))))))
  
! (defun spambayes-gnus-refile-as-spam ()
    "Retrain and refilter all process-marked messages as spam, then respool them"
    (interactive)
***************
*** 95,99 ****
    (gnus-summary-respool-article nil (gnus-group-method gnus-newsgroup-name)))
  
! (defun spambayes-refile-as-ham ()
    "Retrain and refilter all process-marked messages as ham, then respool them"
    (interactive)
--- 131,135 ----
    (gnus-summary-respool-article nil (gnus-group-method gnus-newsgroup-name)))
  
! (defun spambayes-gnus-refile-as-ham ()
    "Retrain and refilter all process-marked messages as ham, then respool them"
    (interactive)
***************
*** 101,102 ****
--- 137,166 ----
    (gnus-summary-respool-article nil (gnus-group-method gnus-newsgroup-name)))
  
+ 
+ ;;; VM
+ 
+ (defun spambayes-vm-retrain (is-spam)
+   "Retrain on all processable articles, or the one under the cursor.
+ 
+ is-spam is a boolean--true if you want to retrain the message as spam,
+ false if you want to retrain as ham.
+ "
+   (interactive)
+   (message (concat "Retraining" (if is-spam " as SPAM" " as HAM") " ..."))
+   (vm-pipe-message-to-command 
+    (concat spambayes-hammiefilter (if is-spam " -s" " -g") " -f") nil)
+   (message (concat "Done retraining messages" 
+                    (if is-spam " as SPAM" " as HAM") ".") )
+ )
+ 
+ (defun spambayes-vm-retrain-as-spam ()
+   "Retrain and refilter messages as spam"
+   (interactive)
+   (spambayes-vm-retrain 't)
+ )
+ 
+ (defun spambayes-vm-retrain-as-ham ()
+   "Retrain and refilter messages as ham"
+   (interactive)
+   (spambayes-vm-retrain nil)
+ )



From grandis at toweroncology.com  Fri Jun  6 12:13:27 2003
From: grandis at toweroncology.com (Greg Randis)
Date: Fri Jun  6 14:14:01 2003
Subject: [Spambayes-checkins] Unable to register dll!
Message-ID: <33EE270315D7D511B91600065B0536498FD469@thont01.toweroncology.com>

Hi All-

I am getting -

	C:\Program Files\Spambayes Outlook Addin\spambayes_addin.dll
	Unable to register the DLL/OCX: DllRegisterServer failed; code
0x00000000.
	Click Retry to try again, Ignore to proceed anyway (not
recommended), or Abort to cancel installation.

Yes, I am/have administrator access to this system. This the binary version
for windows Outlook 2000.


Gregory A. Randis
Director, Information Technology
grandis@toweroncology.com
(310) 289-2840 Office
(310) 678-9397 Cell
(310) 289-2852 Fax



This communication (and/or any accompanying attachments) may contain
confidential healthcare information belonging to the sender which is
protected by physician-patient privilege or rights of staff committee
confidentiality as provided for by state and federal law.  Nothing contained
in this communication and any attachments thereto is intended to waive any
privileges or rights of confidentiality.  The information is intended only
for the use of the individuals or entity to which it is addressed.  If you
are not the intended recipient, you are hereby notified that any disclosure,
copying, distribution, or the taking of any action in reliance on the
contents of this transmission is strictly prohibited by law.  If you have
received this transmission in error, please immediately notify the sender by
telephone, destroy any electronic copies, and arrange to return any hard
copies to the sender.

Tower Hematology Oncology Medical Group
8635 W. Third Street, Suite 665 West
Los Angeles, CA  90048
(310) 289-2840



From anadelonbrin at users.sourceforge.net  Sun Jun  8 16:40:23 2003
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Sun Jun  8 18:40:27 2003
Subject: [Spambayes-checkins] spambayes/spambayes Version.py,1.1,1.2
Message-ID: <E19P8pr-0007hc-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	Version.py 
Log Message:
Change 'core' date to May (when last major changes were seen).

Add version information for hammie, pop3proxy, smtpproxy,
imapfilter.

Index: Version.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/Version.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Version.py	6 Jun 2003 03:57:18 -0000	1.1
--- Version.py	8 Jun 2003 22:40:21 -0000	1.2
***************
*** 8,15 ****
      "Version":          0.1,
      "Description":      "SpamBayes Beta1",
!     "Date":             "June 2003",
      "Full Description": "%(Description)s, version %(Version)s (%(Date)s)",
      # Sub-dict for application specific version strings.
      "Apps": {
          "Outlook" : {
              "Version":          0.3,
--- 8,21 ----
      "Version":          0.1,
      "Description":      "SpamBayes Beta1",
!     "Date":             "May 2003",
      "Full Description": "%(Description)s, version %(Version)s (%(Date)s)",
      # Sub-dict for application specific version strings.
      "Apps": {
+         "Hammie" : {
+             "Version":          0.1,
+             "Description":      "SpamBayes command line tool (Hammie) Beta1",
+             "Date":             "January 2003",
+             "Full Description": "%(Description)s, version %(Version)s (%(Date)s)",
+         },
          "Outlook" : {
              "Version":          0.3,
***************
*** 20,23 ****
--- 26,59 ----
              "Full Description Binary":
                                  "%(Description)s, Binary version %(BinaryVersion)s (%(Date)s)",
+         },
+         "POP3 Proxy" : {
+             "Version":          0.1,
+             "Description":      "SpamBayes POP3 Proxy Beta1",
+             "Date":             "May 2003",
+             "InterfaceVersion":            0.02,
+             "InterfaceDescription":        "SpamBayes POP3 Proxy Web Interface Alpha2",
+             "Full Description": """%(Description)s, version %(Version)s (%(Date)s),
+             using %(InterfaceDescription)s, version %(InterfaceVersion)s""",
+         },
+         "Lotus Notes Filter" : {
+             "Version":          0.01,
+             "Description":      "SpamBayes Lotus Notes Filter Alpha1",
+             "Date":             "March 2003",
+             "Full Description": "%(Description)s, version %(Version)s (%(Date)s)",
+         },
+         "SMTP Proxy" : {
+             "Version":          0.01,
+             "Description":      "SpamBayes SMTP Proxy Alpha1",
+             "Date":             "May 2003",
+             "Full Description": "%(Description)s, version %(Version)s (%(Date)s)",
+         },
+         "IMAP Filter" : {
+             "Version":          0.01,
+             "Description":      "SpamBayes IMAP Filter Alpha1",
+             "Date":             "May 2003",
+             "InterfaceVersion":            0.01,
+             "InterfaceDescription":        "SpamBayes IMAP Filter Web Interface Alpha1",
+             "Full Description": """%(Description)s, version %(Version)s (%(Date)s),
+             using %(InterfaceDescription)s, version %(InterfaceVersion)s""",
          },
      },



From montanaro at users.sourceforge.net  Tue Jun 10 08:03:30 2003
From: montanaro at users.sourceforge.net (Skip Montanaro)
Date: Tue Jun 10 10:15:51 2003
Subject: [Spambayes-checkins] spambayes/contrib spambayes.el,1.3,1.4
Message-ID: <E19Pjik-0004e0-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	spambayes.el 
Log Message:
maybe 't is equivalent to t but I wouldn't count on it in all situations


Index: spambayes.el
===================================================================
RCS file: /cvsroot/spambayes/spambayes/contrib/spambayes.el,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** spambayes.el	6 Jun 2003 17:08:13 -0000	1.3
--- spambayes.el	10 Jun 2003 14:03:26 -0000	1.4
***************
*** 157,161 ****
    "Retrain and refilter messages as spam"
    (interactive)
!   (spambayes-vm-retrain 't)
  )
  
--- 157,161 ----
    "Retrain and refilter messages as spam"
    (interactive)
!   (spambayes-vm-retrain t)
  )
  



From anadelonbrin at users.sourceforge.net  Thu Jun 12 01:19:16 2003
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Thu Jun 12 03:19:19 2003
Subject: [Spambayes-checkins] spambayes/spambayes Version.py,1.2,1.3
Message-ID: <E19QMMe-00046R-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	Version.py 
Log Message:
Bring changelog/what's new up to date.

Add a suggestion to read the FAQ to the readme.



Index: Version.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/Version.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Version.py	8 Jun 2003 22:40:21 -0000	1.2
--- Version.py	12 Jun 2003 07:19:14 -0000	1.3
***************
*** 34,38 ****
              "InterfaceDescription":        "SpamBayes POP3 Proxy Web Interface Alpha2",
              "Full Description": """%(Description)s, version %(Version)s (%(Date)s),
!             using %(InterfaceDescription)s, version %(InterfaceVersion)s""",
          },
          "Lotus Notes Filter" : {
--- 34,38 ----
              "InterfaceDescription":        "SpamBayes POP3 Proxy Web Interface Alpha2",
              "Full Description": """%(Description)s, version %(Version)s (%(Date)s),
! using %(InterfaceDescription)s, version %(InterfaceVersion)s""",
          },
          "Lotus Notes Filter" : {
***************
*** 55,59 ****
              "InterfaceDescription":        "SpamBayes IMAP Filter Web Interface Alpha1",
              "Full Description": """%(Description)s, version %(Version)s (%(Date)s),
!             using %(InterfaceDescription)s, version %(InterfaceVersion)s""",
          },
      },
--- 55,59 ----
              "InterfaceDescription":        "SpamBayes IMAP Filter Web Interface Alpha1",
              "Full Description": """%(Description)s, version %(Version)s (%(Date)s),
! using %(InterfaceDescription)s, version %(InterfaceVersion)s""",
          },
      },



From anadelonbrin at users.sourceforge.net  Thu Jun 12 01:19:16 2003
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Thu Jun 12 03:19:20 2003
Subject: [Spambayes-checkins] spambayes CHANGELOG.txt, 1.3, 1.4 README.txt,
	1.48, 1.49 WHAT_IS_NEW.txt, 1.3, 1.4
Message-ID: <E19QMMe-00046J-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	CHANGELOG.txt README.txt WHAT_IS_NEW.txt 
Log Message:
Bring changelog/what's new up to date.

Add a suggestion to read the FAQ to the readme.



Index: CHANGELOG.txt
===================================================================
RCS file: /cvsroot/spambayes/spambayes/CHANGELOG.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CHANGELOG.txt	5 Jun 2003 22:40:39 -0000	1.3
--- CHANGELOG.txt	12 Jun 2003 07:19:13 -0000	1.4
***************
*** 244,245 ****
--- 244,250 ----
  Mark Hammond    04/06/03    In Outlook plugin, when filtering, saving the spam score is no longer fatal.
  Tony Meyer  04/06/03    In muttrc, fix incorrect Spambayes header name.
+ Mark Hammond    05/06/03    Add a version information repository.
+ Mark Hammond    05/06/03    Change Outlook plugin to use new version information repository.
+ Neale Pickett   06/06/03    Integrated code for the VM mailer into spambayes.el
+ Tony Meyer  08/06/03    Add pop3proxy, hammie, smtpproxy & imapfilter version information.
+ Skip Montanaro  10/06/03    Correction to VM mailer addition to spambayes.el

Index: README.txt
===================================================================
RCS file: /cvsroot/spambayes/spambayes/README.txt,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** README.txt	2 May 2003 04:05:11 -0000	1.48
--- README.txt	12 Jun 2003 07:19:13 -0000	1.49
***************
*** 26,29 ****
--- 26,32 ----
  The code in this project requires Python 2.2 (or later).
  
+ You should definately check out the FAQ:
+ http://spambayes.org/faq.html
+ 
  
  Primary Core Files

Index: WHAT_IS_NEW.txt
===================================================================
RCS file: /cvsroot/spambayes/spambayes/WHAT_IS_NEW.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** WHAT_IS_NEW.txt	5 Jun 2003 22:40:40 -0000	1.3
--- WHAT_IS_NEW.txt	12 Jun 2003 07:19:13 -0000	1.4
***************
*** 28,37 ****
   o Databases are saved after any training operation.
   o Handle malformed messages better in the Outlook plugin.
!  o In Outlook plugin, create our own toolbar, rather than using the standard one.
   o Use 'wait' cursor when incremental training in Outlook plugin.
   o In Outlook plugin, save config when dialog closes and not at shutdown.
   o Clean up toolbar images.
   o In Outlook plugin, no longer default to the "Inbox".
!  o In Outlook plugin, when filtering, saving the spam score is no longer fatal.
  
  POP3 Proxy
--- 28,39 ----
   o Databases are saved after any training operation.
   o Handle malformed messages better in the Outlook plugin.
!  o In Outlook plugin, create our own toolbar, rather than using the
!    standard one.
   o Use 'wait' cursor when incremental training in Outlook plugin.
   o In Outlook plugin, save config when dialog closes and not at shutdown.
   o Clean up toolbar images.
   o In Outlook plugin, no longer default to the "Inbox".
!  o In Outlook plugin, when filtering, saving the spam score is no longer
!    fatal.
  
  POP3 Proxy
***************
*** 75,78 ****
--- 77,81 ----
   o Test code moved out of pop3proxy.py.
   o Web interface code abstracted out of pop3proxy.py.
+  o A version information repository for all applications.
  
  General
***************
*** 97,103 ****
     yo&#117;r se<!XE>p&#116;ic sys&#116;em becomes "your septic system".
   o <p> and <br> tags are replaced with single blanks.
!  o DB classifier keeps a list of "changed words" to prevent saves from updating *all* words.
   o DB classifier no longer caches hapaxes.
   o In muttrc, fix incorrect Spambayes header name.
  
  
--- 100,108 ----
     yo&#117;r se<!XE>p&#116;ic sys&#116;em becomes "your septic system".
   o <p> and <br> tags are replaced with single blanks.
!  o DB classifier keeps a list of "changed words" to prevent saves from
!    updating *all* words.
   o DB classifier no longer caches hapaxes.
   o In muttrc, fix incorrect Spambayes header name.
+  o Integrated code for the VM mailer into spambayes.el
  
  



From anadelonbrin at users.sourceforge.net  Thu Jun 12 01:25:08 2003
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Thu Jun 12 03:25:11 2003
Subject: [Spambayes-checkins] 
	spambayes CHANGELOG.txt, 1.4, 1.5 imapfilter.py,
	1.43, 1.44 pop3proxy.py, 1.80, 1.81
Message-ID: <E19QMSK-0004f1-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	CHANGELOG.txt imapfilter.py pop3proxy.py 
Log Message:
Print out version information in pop3proxy and imapfilter.

Remove code from pop3proxy that has been commented out
for a *very* long time.  (cvs will store it for us).

Index: CHANGELOG.txt
===================================================================
RCS file: /cvsroot/spambayes/spambayes/CHANGELOG.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CHANGELOG.txt	12 Jun 2003 07:19:13 -0000	1.4
--- CHANGELOG.txt	12 Jun 2003 07:25:02 -0000	1.5
***************
*** 249,250 ****
--- 249,251 ----
  Tony Meyer  08/06/03    Add pop3proxy, hammie, smtpproxy & imapfilter version information.
  Skip Montanaro  10/06/03    Correction to VM mailer addition to spambayes.el
+ Tony Meyer  12/06/03    Update pop3proxy and imapfilter to print out version information.

Index: imapfilter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/imapfilter.py,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** imapfilter.py	11 May 2003 22:49:41 -0000	1.43
--- imapfilter.py	12 Jun 2003 07:25:03 -0000	1.44
***************
*** 107,110 ****
--- 107,111 ----
  from spambayes.UserInterface import UserInterfaceServer
  from spambayes.ImapUI import IMAPUserInterface
+ from spambayes.Version import get_version_string
  
  from imaplib import Debug
***************
*** 657,660 ****
--- 658,665 ----
          elif opt == '-l':
              sleepTime = int(arg) * 60
+ 
+     # Let the user know what they are using...
+     print get_version_string("IMAP Filter")
+     print "and engine %s.\n" % (get_version_string(),)
  
      if not (doClassify or doTrain or launchUI):

Index: pop3proxy.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/pop3proxy.py,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** pop3proxy.py	5 May 2003 01:23:07 -0000	1.80
--- pop3proxy.py	12 Jun 2003 07:25:03 -0000	1.81
***************
*** 102,105 ****
--- 102,106 ----
  from spambayes.UserInterface import UserInterfaceServer
  from spambayes.ProxyUI import ProxyUserInterface
+ from spambayes.Version import get_version_string
  
  # Increase the stack size on MacOS X.  Stolen from Lib/test/regrtest.py
***************
*** 234,250 ****
              return False
  
-     ## This is an attempt to solve the problem whereby the email client
-     ## times out and closes the connection but the ServerLineReader is still
-     ## connected, so you get errors from the POP3 server next time because
-     ## there's already an active connection.  But after introducing this,
-     ## I kept getting unexplained "Bad file descriptor" errors in recv.
-     ##
-     ## def handle_close(self):
-     ##     """If the email client closes the connection unexpectedly, eg.
-     ##     because of a timeout, close the server connection."""
-     ##     self.serverSocket.shutdown(2)
-     ##     self.serverSocket.close()
-     ##     self.close()
- 
      def collect_incoming_data(self, data):
          """Asynchat override."""
--- 235,238 ----
***************
*** 709,712 ****
--- 697,704 ----
          elif opt == '-u':
              state.uiPort = int(arg)
+ 
+     # Let the user know what they are using...
+     print get_version_string("POP3 Proxy")
+     print "and engine %s.\n" % (get_version_string(),)
  
      # Do whatever we've been asked to do...



From mhammond at users.sourceforge.net  Sun Jun 15 21:46:15 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Sun Jun 15 23:46:20 2003
Subject: [Spambayes-checkins] spambayes/spambayes OptionsClass.py, NONE,
	1.1 Options.py, 1.54, 1.55
Message-ID: <E19Rkwh-0001U5-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	Options.py 
Added Files:
	OptionsClass.py 
Log Message:
Split the class into its own file, so it is possible to use other
instances *without* loading the default SpamBayes options.
(Outlook now uses this file format, but stores its UI options in
a different file).

Allow lists to be used for multi-valued options (previously only
tuples were supported.)

Allow the first entry in the "defaults" table to be a sub-class of
Option - this allows custom packing/unpacking - currently only
used by Outlook to manage folder IDs (which are a list of tuples)


--- NEW FILE: OptionsClass.py ---
"""OptionsCore

Classes:
    Option - Holds information about an option
    OptionsClass - A collection of options

Abstract:

This module is used to manage "options" managed in user editable files.
This is the implementation of the Options.options globally shared options
object for the SpamBayes project, but is also able to be used to manage
other options required by each application.

The Option class holds information about an option - the name of the
option, a nice name (to display), documentation, default value,
possible values (a tuple or a regex pattern), whether multiple values
are allowed, and whether the option should be reset when restoring to
defaults (options like server names should *not* be).

The OptionsClass class provides facility for a collection of Options.
It is expected that manipulation of the options will be carried out
via an instance of this class.

To Do:
 o Get rid of the really ugly backwards compatability code (that adds
   many, many attributes to the options object) as soon as all the
   modules are changed over.
 o Once the above is done, and we have waited a suitable time, stop
   allowing invalid options in configuration files
 o Find a regex expert to come up with *good* patterns for domains,
   email addresses, and so forth.
 o str(Option) should really call Option.unconvert since this is what
   it does.  Try putting that in and running all the tests.
 o [See also the __issues__ string.]
 o Suggestions?

"""
# This module is part of the spambayes project, which is Copyright 2002-3
# The Python Software Foundation and is covered by the Python Software
# Foundation license.

__credits__ = "All the Spambayes folk."
# blame for the new format: Tony Meyer <ta-meyer@ihug.co.nz>

__issues__ = """Things that should be considered further and by
other people:

We are very generous in checking validity when multiple values are
allowed and the check is a regex (rather than a tuple).  Any sequence
that does not match the regex may be used to delimit the values.
For example, if the regex was simply r"[\d]*" then these would all
be considered valid:
"123a234" -> 123, 234
"123abced234" -> 123, 234
"123XST234xas" -> 123, 234
"123 234" -> 123, 234
"123~!@$%^&@234!" -> 123, 234

If this is a problem, my recommendation would be to change the
multiple_values_allowed attribute from a boolean to a regex/None
i.e. if multiple is None, then only one value is allowed.  Otherwise
multiple is used in a re.split() to separate the input.
"""

import sys
import os
import shutil
from tempfile import TemporaryFile

try:
    import cStringIO as StringIO
except ImportError:
    import StringIO

import re
import types
import locale

try:
    True, False, bool
except NameError:
    # Maintain compatibility with Python 2.2
    True, False = 1, 0
    def bool(val):
        return not not val

__all__ = ['OptionsClass',
           'HEADER_NAME', 'HEADER_VALUE',
           'INTEGER', 'REAL', 'BOOLEAN',
           'SERVER', 'PORT', 'EMAIL_ADDRESS',
           'PATH', 'VARIABLE_PATH', 'FILE', 'FILE_WITH_PATH',
           'IMAP_FOLDER', 'IMAP_ASTRING',
           'RESTORE', 'DO_NOT_RESTORE',
          ]

MultiContainerTypes = (types.TupleType, types.ListType)

class Option(object):
    def __init__(self, name, nice_name="", default=None,
                 help_text="", allowed=None, restore=True):
        self.name = name
        self.nice_name = nice_name
        self.default_value = default
        self.explanation_text = help_text
        self.allowed_values = allowed
        self.restore = restore
        self.delimiter = None
        # start with default value
        self.set(default)

    def display_name(self):
        '''A name for the option suitable for display to a user.'''
        return self.nice_name
    def default(self):
        '''The default value for the option.'''
        return self.default_value
    def doc(self):
        '''Documentation for the option.'''
        return self.explanation_text
    def valid_input(self):
        '''Valid values for the option.'''
        return self.allowed_values
    def no_restore(self):
        '''Do not restore this option when restoring to defaults.'''
        return not self.restore
    def set(self, val):
        '''Set option to value.'''
        self.value = val
    def get(self):
        '''Get option value.'''
        return self.value
    def multiple_values_allowed(self):
        '''Multiple values are allowed for this option.'''
        return type(self.value) in MultiContainerTypes
    
    def is_valid(self, value):
        '''Check if this is a valid value for this option.'''
# XXX This test is in the original code, but makes no sense....
# XXX self.allowed_values defaults to None, and if that is the
# XXX current value, then whatever is passed would be invalid
# XXX I agree this is a silly state to be in, but it is possible
# XXX I suppose that self.allowed_values should default to *any*
# XXX rather than None, but I'm not sure how to express that,
# XXX unless the regex r"." is correct.
        if self.allowed_values is None:
            return False

        if type(self.value) in MultiContainerTypes:
            return self.is_valid_multiple(value)
        else:
            return self.is_valid_single(value)

    def is_valid_multiple(self, value):
        '''Return True iff value is a valid value for this option.
        Use if multiple values are allowed.'''
        if type(value) in MultiContainerTypes:
            for val in value:
                if not self.is_valid_single(val):
                    return False
            return True
        return self.is_valid_single(value)

    def is_valid_single(self, value):
        '''Return True iff value is a valid value for this option.
        Use when multiple values are not allowed.'''
        if type(self.allowed_values) == types.TupleType:
            if value in self.allowed_values:
                return True
            else:
                return False
        else:
            # special handling for booleans, thanks to Python 2.2
            if self.is_boolean and (value == True or value == False):
                return True
            if type(value) != type(self.value) and \
               type(self.value) not in MultiContainerTypes:
                # This is very strict!  If the value is meant to be
                # a real number and an integer is passed in, it will fail.
                # (So pass 1. instead of 1, for example)
                return False
            avals = self._split_values(value)
            # in this case, allowed_values must be a regex, and
            # _split_values must match once and only once
            if len(avals) == 1:
                return True
            else:
                # either no match or too many matches
                return False
            
    def _split_values(self, value):
        # do the regex mojo here
        try:
            r = re.compile(self.allowed_values)
        except:
            print self.allowed_values
            raise
        s = str(value)
        i = 0
        vals = ()
        while True:
            m = r.search(s[i:])
            if m is None:
                break
            vals += (m.group(),)
            delimiter = s[i:i + m.start()]
            if self.delimiter is None and delimiter != "":
                self.delimiter = delimiter
            i += m.end()
        return vals

    def as_nice_string(self, section=None):
        '''Summarise the option in a user-readable format.'''
        if section is None:
            strval = ""
        else:
            strval = "[%s] " % (section)
        strval += "%s - \"%s\"\nDefault: %s\nDo not restore: %s\n" \
                 % (self.name, self.display_name(),
                    str(self.default()), str(self.no_restore()))
        strval += "Valid values: %s\nMultiple values allowed: %s\n" \
                  % (str(self.valid_input()),
                     str(self.multiple_values_allowed()))
        strval += "\"%s\"\n\n" % (str(self.doc()))
        return strval

    def write_config(self, file):
        '''Output value in configuration file format.'''
        file.write(self.name)
        file.write(': ')
        file.write(self.unconvert())
        file.write('\n')

    def convert(self, value):
        '''Convert value from a string to the appropriate type.'''
        svt = type(self.value)
        if svt == type(value):
            # already the correct type
            return value
        if self.is_boolean():
            if str(value) == "True" or value == 1:
                return True
            elif str(value) == "False" or value == 0:
                return False
            raise TypeError, self.name + " must be True or False"
        if self.multiple_values_allowed():
            # This will fall apart if the allowed_value is a tuple,
            # but not a homogenous one...
            if type(self.allowed_values) in types.StringTypes:
                vals = list(self._split_values(value))
            else:
                vals = value.split()
            if len(self.default_value) > 0:
                to_type = type(self.default_value[0])
            else:
                to_type = types.StringType
            for i in range(0, len(vals)):
                vals[i] = self._convert(vals[i], to_type)
            return tuple(vals)
        else:
            return self._convert(value, svt)
        raise TypeError, self.name + " has an invalid type."

    def _convert(self, value, to_type):
        '''Convert an int, float or string to the specified type.'''
        if to_type == type(value):
            # already the correct type
            return value
        if to_type == types.IntType:
            return locale.atoi(value)
        if to_type == types.FloatType:
            return locale.atof(value)
        if to_type in types.StringTypes:
            return str(value)
        raise TypeError, "Invalid type."

    def unconvert(self):
        '''Convert value from the appropriate type to a string.'''
        if type(self.value) in types.StringTypes:
            # nothing to do
            return self.value
        if self.is_boolean():
            # A wee bit extra for Python 2.2
            if self.value == True:
                return "True"
            else:
                return "False"
        if type(self.value) == types.TupleType:
            if len(self.value) == 0:
                return ""
            if len(self.value) == 1:
                v = self.value[0]
                if type(v) == types.FloatType:
                    return locale.str(self.value[0])
                return str(v)
            # We need to separate out the items
            strval = ""
            # We use a character that is invalid as the separator
            # so that it will reparse correctly.  We could try all
            # characters, but we make do with this set of commonly
            # used ones - note that the first one that works will
            # be used.  Perhaps a nicer solution than this would be
            # to specifiy a valid delimiter for all options that
            # can have multiple values.  Note that we have None at
            # the end so that this will crash and die if none of
            # the separators works <wink>.
            if self.delimiter is None:
                if type(self.allowed_values) == types.TupleType:
                    self.delimiter = ' '
                else:
                    v0 = self.value[0]
                    v1 = self.value[1]
                    for sep in [' ', ',', ':', ';', '/', '\\', None]:
                        # we know at this point that len(self.value) is at
                        # least two, because len==0 and len==1 were dealt
                        # with as special cases
                        test_str = str(v0) + sep + str(v1)
                        test_tuple = self._split_values(test_str)
                        if test_tuple[0] == str(v0) and \
                           test_tuple[1] == str(v1) and \
                           len(test_tuple) == 2:
                            break
                    # cache this so we don't always need to do the above
                    self.delimiter = sep
            for v in self.value:
                if type(v) == types.FloatType:
                    v = locale.str(v)
                else:
                    v = str(v)
                strval += v + self.delimiter
            strval = strval[:-len(self.delimiter)] # trailing seperator
        else:
            # Otherwise, we just hope str() will do the job
            strval = str(self.value)
        return strval

    def is_boolean(self):
        '''Return True iff the option is a boolean value.'''
        # This is necessary because of the Python 2.2 True=1, False=0
        # cheat.  The valid values are returned as 0 and 1, even if
        # they are actually False and True - but 0 and 1 are not
        # considered valid input (and 0 and 1 don't look as nice)
        # So, just for the 2.2 people, we have this helper function
        try:
            if type(self.allowed_values) == types.TupleType and \
               len(self.allowed_values) > 0 and \
               type(self.allowed_values[0]) == types.BooleanType:
                return True
            return False
        except AttributeError:
            # If the user has Python 2.2 and an option has valid values
            # of (0, 1) - i.e. integers, then this function will return
            # the wrong value.  I don't know what to do about that without
            # explicitly stating which options are boolean
            if self.allowed_values == (False, True):
                return True
            return False


class OptionsClass(object):
    def __init__(self):
        self.verbose = None
        self._options = {}
        self.conversion_table = {} # set by creator if they need it.
    #
    # Regular expressions for parsing section headers and options.
    # Lifted straight from ConfigParser
    #
    SECTCRE = re.compile(
        r'\['                                 # [
        r'(?P<header>[^]]+)'                  # very permissive!
        r'\]'                                 # ]
        )
    OPTCRE = re.compile(
        r'(?P<option>[^:=\s][^:=]*)'          # very permissive!
        r'\s*(?P<vi>[:=])\s*'                 # any number of space/tab,
                                              # followed by separator
                                              # (either : or =), followed
                                              # by any # space/tab
        r'(?P<value>.*)$'                     # everything up to EOL
        )

    def update_file(self, filename):
        '''Update the specified configuration file.'''
        sectname = None
        optname = None
        out = TemporaryFile()
        if os.path.exists(filename):
            f = file(filename, "r")
        else:
            # doesn't exist, so create it - all the changed options will
            # be added to it
            if self.verbose:
                print "Creating new configuration file", filename
            f = file(filename, "w")
            f.close()
            f = file(filename, "r")
        written = []
        vi = ": " # default; uses the one from the file where possible
        while True:
            line = f.readline()
            if not line:
                break
            # comment or blank line?
            if line.strip() == '' or line[0] in '#;':
                out.write(line)
                continue
            if line.split(None, 1)[0].lower() == 'rem' and line[0] in "rR":
                # no leading whitespace
                out.write(line)
                continue
            # continuation line?
            if line[0].isspace() and sectname is not None and optname:
                continue
            # a section header or option header?
            else:
                # is it a section header?
                mo = self.SECTCRE.match(line)
                if mo:
                    # Add any missing from the previous section
                    if sectname is not None:
                        self._add_missing(out, written, sectname, vi, False)
                    sectname = mo.group('header')
                    # So sections can't start with a continuation line
                    optname = None
                    if sectname in self.sections():
                        out.write(line)
                # an option line?
                else:
                    mo = self.OPTCRE.match(line)
                    if mo:
                        optname, vi, optval = mo.group('option', 'vi', 'value')
                        if vi in ('=', ':') and ';' in optval:
                            # ';' is a comment delimiter only if it follows
                            # a spacing character
                            pos = optval.find(';')
                            if pos != -1 and optval[pos-1].isspace():
                                optval = optval[:pos]
                        optval = optval.strip()
                        # allow empty values
                        if optval == '""':
                            optval = ''
                        optname = optname.rstrip().lower()
                        if self._options.has_key((sectname, optname)):
                            out.write(optname)
                            out.write(vi)
                            out.write(self.unconvert(sectname, optname))
                            out.write('\n')
                            written.append((sectname, optname))
        for sect in self.sections():
            self._add_missing(out, written, sect, vi)
        f.close()
        out.flush()
        if self.verbose:
            # save a backup of the old file
            shutil.copyfile(filename, filename + ".bak")
        # copy the new file across
        f = file(filename, "w")
        out.seek(0)
        shutil.copyfileobj(out, f)
        out.close()
        f.close()
    
    def _add_missing(self, out, written, sect, vi, label=True):
        # add any missing ones, where the value does not equal the default
        for opt in self.options_in_section(sect):
            if not (sect, opt) in written and \
               self.get(sect, opt) != self.default(sect, opt):
                if label:
                    out.write('[')
                    out.write(sect)
                    out.write("]\n")
                    label = False
                out.write(opt)
                out.write(vi)
                out.write(self.unconvert(sect, opt))
                out.write('\n')
                written.append((sect, opt))

    def load_defaults(self, defaults):
        '''Load default values (stored in this module).'''
        for section, opts in defaults.items():
            for opt in opts:
                # If first item of the tuple is a sub-class of Option, then
                # instantiate that (with the rest as args).  Otherwise,
                # assume standard Options class.
                klass = Option
                args = opt
                try:
                    if issubclass(opt[0], Option):
                        klass = opt[0]
                        args = opt[1:]
                except TypeError: # opt[0] not a class
                    pass
                        
                o = klass(*args)
                self._options[section, o.name] = o
                # A (really ugly) bit of backwards compatability
                # *** This will vanish soon, so do not make use of it in
                #     new code ***
                self._oldset(section, o.name, o.value)

    def _oldset(self, section, option, value):
        # A (really ugly) bit of backwards compatability
        # *** This will vanish soon, so do not make use of it in
        #     new code ***
        for (oldsect, oldopt), (newsect, newopt) in self.conversion_table.items():
            if (newsect, newopt) == (section, option):
                section = oldsect
                option = oldopt
        setattr(self, option, value)
        old_name = section[0:1].lower() + section[1:] + "_" + option
        setattr(self, old_name, value)
                
    def merge_files(self, file_list):
        for file in file_list:
            self.merge_file(file)

    def merge_file(self, filename):
        import ConfigParser
        c = ConfigParser.ConfigParser()
        c.read(filename)
        for sect in c.sections():
            for opt in c.options(sect):
                value = c.get(sect, opt)
                section = sect
                option = opt
                # backward compatibility guff, but only if needed.
                if self.conversion_table:
                    if opt[:len(sect) + 1].lower() == sect.lower() + '_':
                        opt = opt[len(sect)+1:]
                    if self.conversion_table.has_key((sect, opt)):
                        section, option = self.conversion_table[sect, opt]
                    else:
                        section = sect
                        option = opt
                else: # no b/w compat needed.
                    section = sect
                    option = opt
                # end of backward compatibility guff
                if not self._options.has_key((section, option)):
                    print "Invalid option %s in section %s in file %s" % \
                          (opt, sect, filename)
                else:
                    if self.multiple_values_allowed(section, option):
                        value = self.convert(section, option, value)
                    value = self.convert(section, option, value)
                    self.set(section, option, value)
                    # backward compatibility guff
                    if self.conversion_table:
                        self._oldset(sect, opt, value)
                    # end of backward compatibility guff

    # not strictly necessary, but convenient shortcuts to self._options
    def display_name(self, sect, opt):
        '''A name for the option suitable for display to a user.'''
        return self._options[sect, opt].display_name()
    def default(self, sect, opt):
        '''The default value for the option.'''
        return self._options[sect, opt].default()
    def doc(self, sect, opt):
        '''Documentation for the option.'''
        return self._options[sect, opt].doc()
    def valid_input(self, sect, opt):
        '''Valid values for the option.'''
        return self._options[sect, opt].valid_input()
    def no_restore(self, sect, opt):
        '''Do not restore this option when restoring to defaults.'''
        return self._options[sect, opt].no_restore()
    def is_valid(self, sect, opt, value):
        '''Check if this is a valid value for this option.'''
        return self._options[sect, opt].is_valid(value)
    def multiple_values_allowed(self, sect, opt):
        '''Multiple values are allowed for this option.'''
        return self._options[sect, opt].multiple_values_allowed()

    def is_boolean(self, sect, opt):
        '''The option is a boolean value. (Support for Python 2.2).'''
        return self._options[sect, opt].is_boolean()

    def convert(self, sect, opt, value):
        '''Convert value from a string to the appropriate type.'''
        return self._options[sect, opt].convert(value)

    def unconvert(self, sect, opt):
        '''Convert value from the appropriate type to a string.'''
        return self._options[sect, opt].unconvert()

    def get(self, sect, opt):
        '''Get an option.'''
        if self.conversion_table.has_key((sect, opt)):
            sect, opt = self.conversion_table[sect, opt]
        return self._options[sect, opt].get()

    def __getitem__(self, key):
        return self.get(key[0], key[1])

    def set(self, sect, opt, val=None):
        '''Set an option.'''
        if self.conversion_table.has_key((sect, opt)):
            sect, opt = self.conversion_table[sect, opt]
        if self.is_valid(sect, opt, val):
            self._options[sect, opt].set(val)
            # backwards compatibility stuff
            self._oldset(sect, opt, val)
        else:
            print "Attempted to set [%s] %s with invalid value %s (%s)" % \
                  (sect, opt, val, type(val))
        
    def __setitem__(self, key, value):
        self.set(key[0], key[1], value)

    def sections(self):
        '''Return an alphabetical list of all the sections.'''
        all = []
        for sect, opt in self._options.keys():
            if sect not in all:
                all.append(sect)
        all.sort()
        return all
    
    def options_in_section(self, section):
        '''Return an alphabetical list of all the options in this section.'''
        all = []
        for sect, opt in self._options.keys():
            if sect == section:
                all.append(opt)
        all.sort()
        return all

    def options(self, prepend_section_name=False):
        '''Return a alphabetical list of all the options, optionally
        prefixed with [section_name]'''
        all = []
        for sect, opt in self._options.keys():
            if prepend_section_name:
                all.append('[' + sect + ']' + opt)
            else:
                all.append(opt)
        all.sort()
        return all

    def display(self):
        '''Display options in a config file form.'''
        output = StringIO.StringIO()
        keys = self._options.keys()
        keys.sort()
        currentSection = None
        for sect, opt in keys:
            if sect != currentSection:
                if currentSection is not None:
                    output.write('\n')
                output.write('[')
                output.write(sect)
                output.write("]\n")
                currentSection = sect
            self._options[sect, opt].write_config(output)
        return output.getvalue()

    def display_full(self, section=None, option=None):
       '''Display options including all information.'''
       # Given that the Options class is no longer as nice looking
       # as it once was, this returns all the information, i.e.
       # the doc, default values, and so on
       output = StringIO.StringIO()

       # when section and option are both specified, this
       # is nothing more than a call to as_nice_string
       if section is not None and option is not None:
           output.write(self._options[section,
                                      option].as_nice_string(section))
           return output.getvalue()
       
       all = self._options.keys()
       all.sort()
       for sect, opt in all:
           if section is not None and sect != section:
               continue
           output.write(self._options[sect, opt].as_nice_string(sect))
       return output.getvalue()

# These are handy references to commonly used regex/tuples defining
# permitted values. Although the majority of options use one of these,
# you may use any regex or tuple you wish.
HEADER_NAME = r"[\w\.\-\*]+"
HEADER_VALUE = r"[\w\.\-\*]+"
INTEGER = r"[\d]+"              # actually, a *positive* integer
REAL = r"[\d]+[\.]?[\d]*"       # likewise, a *positive* real
BOOLEAN = (False, True)
SERVER = r"([\w\.\-]+(:[\d]+)?)"  # in the form server:port
PORT = r"[\d]+"
EMAIL_ADDRESS = r"[\w\-\.]+@[\w\-\.]+"
PATH = r"[\w\.\-~:\\/\*]+"
VARIABLE_PATH = PATH + r"%"
FILE = r"[\S]+"
FILE_WITH_PATH = PATH
# IMAP seems to allow any character at all in a folder name,
# but we want to use the comma as a delimiter for lists, so
# we don't allow this.  If anyone has folders with commas in the
# names, please let us know and we'll figure out something else.
# ImapUI.py prints out a warning if this is the case.
IMAP_FOLDER = r"[^,]+"

# IMAP's astring should also be valid in the form:
#   "{" number "}" CRLF *CHAR8
#   where number represents the number of CHAR8 octets
# but this is too complex for us at the moment.
IMAP_ASTRING = ""
for i in range(1, 128):
    if not chr(i) in ['"', '\\', '\n', '\r']:
        IMAP_ASTRING += chr(i)
IMAP_ASTRING = r"\"?\\?[" + re.escape(IMAP_ASTRING) + r"]+\"?"

# Similarly, each option must specify whether it should be reset to
# this value on a "reset to defaults" command.  Most should, but with some
# like a server name that defaults to "", this would be pointless.
# Again, for ease of reading, we define these here:
RESTORE = True
DO_NOT_RESTORE = False

Index: Options.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/Options.py,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** Options.py	26 May 2003 00:00:53 -0000	1.54
--- Options.py	16 Jun 2003 03:46:13 -0000	1.55
***************
*** 1,8 ****
  """Options
  
- Classes:
-     Option - Holds information about an option
-     OptionsClass - A collection of options
- 
  Abstract:
  
--- 1,4 ----
***************
*** 14,26 ****
  the initial values are loaded from this.
  
! The Option class holds information about an option - the name of the
! option, a nice name (to display), documentation, default value,
! possible values (a tuple or a regex pattern), whether multiple values
! are allowed, and whether the option should be reset when restoring to
! defaults (options like server names should *not* be).
! 
! The OptionsClass class provides facility for a collection of Options.
! It is expected that manipulation of the options will be carried out
! via an instance of this class.
  
  To Do:
--- 10,16 ----
  the initial values are loaded from this.
  
! The Option class is defined in OptionsClass.py - this module
! is responsible only for instantiating and loading the globally
! shared instance.
  
  To Do:
***************
*** 28,90 ****
     many, many attributes to the options object) as soon as all the
     modules are changed over.
-  o Once the above is done, and we have waited a suitable time, stop
-    allowing invalid options in configuration files
-  o Find a regex expert to come up with *good* patterns for domains,
-    email addresses, and so forth.
-  o str(Option) should really call Option.unconvert since this is what
-    it does.  Try putting that in and running all the tests.
-  o [See also the __issues__ string.]
-  o Suggestions?
- 
- """
- 
- # This module is part of the spambayes project, which is Copyright 2002-3
- # The Python Software Foundation and is covered by the Python Software
- # Foundation license.
- 
- __credits__ = "All the Spambayes folk."
- # blame for the new format: Tony Meyer <ta-meyer@ihug.co.nz>
- 
- __issues__ = """Things that should be considered further and by
- other people:
- 
- We are very generous in checking validity when multiple values are
- allowed and the check is a regex (rather than a tuple).  Any sequence
- that does not match the regex may be used to delimit the values.
- For example, if the regex was simply r"[\d]*" then these would all
- be considered valid:
- "123a234" -> 123, 234
- "123abced234" -> 123, 234
- "123XST234xas" -> 123, 234
- "123 234" -> 123, 234
- "123~!@$%^&@234!" -> 123, 234
- 
- If this is a problem, my recommendation would be to change the
- multiple_values_allowed attribute from a boolean to a regex/None
- i.e. if multiple is None, then only one value is allowed.  Otherwise
- multiple is used in a re.split() to separate the input.
  """
- 
- import sys
  import os
- import shutil
- from tempfile import TemporaryFile
  
! try:
!     import cStringIO as StringIO
! except ImportError:
!     import StringIO
! 
! import re
! import types
! import locale
! 
! try:
!     True, False, bool
! except NameError:
!     # Maintain compatibility with Python 2.2
!     True, False = 1, 0
!     def bool(val):
!         return not not val
  
  # Backwards compatibility stuff - this will be removed at some point
--- 18,25 ----
     many, many attributes to the options object) as soon as all the
     modules are changed over.
  """
  import os
  
! __all__ = ['options']
  
  # Backwards compatibility stuff - this will be removed at some point
***************
*** 139,182 ****
  }
  
! # These are handy references to commonly used regex/tuples defining
! # permitted values. Although the majority of options use one of these,
! # you may use any regex or tuple you wish.
! HEADER_NAME = r"[\w\.\-\*]+"
! HEADER_VALUE = r"[\w\.\-\*]+"
! INTEGER = r"[\d]+"              # actually, a *positive* integer
! REAL = r"[\d]+[\.]?[\d]*"       # likewise, a *positive* real
! BOOLEAN = (False, True)
! SERVER = r"([\w\.\-]+(:[\d]+)?)"  # in the form server:port
! PORT = r"[\d]+"
! EMAIL_ADDRESS = r"[\w\-\.]+@[\w\-\.]+"
! PATH = r"[\w\.\-~:\\/\*]+"
! VARIABLE_PATH = PATH + r"%"
! FILE = r"[\S]+"
! FILE_WITH_PATH = PATH
! # IMAP seems to allow any character at all in a folder name,
! # but we want to use the comma as a delimiter for lists, so
! # we don't allow this.  If anyone has folders with commas in the
! # names, please let us know and we'll figure out something else.
! # ImapUI.py prints out a warning if this is the case.
! IMAP_FOLDER = r"[^,]+"
! 
! # IMAP's astring should also be valid in the form:
! #   "{" number "}" CRLF *CHAR8
! #   where number represents the number of CHAR8 octets
! # but this is too complex for us at the moment.
! IMAP_ASTRING = ""
! for i in range(1, 128):
!     if not chr(i) in ['"', '\\', '\n', '\r']:
!         IMAP_ASTRING += chr(i)
! IMAP_ASTRING = r"\"?\\?[" + re.escape(IMAP_ASTRING) + r"]+\"?"
! 
! # Similarly, each option must specify whether it should be reset to
! # this value on a "reset to defaults" command.  Most should, but with some
! # like a server name that defaults to "", this would be pointless.
! # Again, for ease of reading, we define these here:
! RESTORE = True
! DO_NOT_RESTORE = False
! 
! __all__ = ['options']
  
  # Format:
--- 74,79 ----
  }
  
! # Grab the stuff from the core options class.
! from OptionsClass import *
  
  # Format:
***************
*** 910,947 ****
    ),
  
-   "Outlook" : (
-     ("train_recovered_spam", "", True,
-      """""",
-      BOOLEAN, RESTORE),
- 
-     ("train_manual_spam", "", True,
-      """""",
-      BOOLEAN, RESTORE),
- 
-     ("spam_action", "", "Untouched",
-      """""",
-      ("Untouched", "Moved", "Copied"), RESTORE),
- 
-     ("unsure_action", "", "Untouched",
-      """""",
-      ("Untouched", "Moved", "Copied"), RESTORE),
- 
-     ("filter_enabled", "", False,
-      """""",
-      BOOLEAN, RESTORE),
- 
-     ("field_score_name", "", "Spam",
-      """""",
-      r"[\w]+", RESTORE),
- 
-     ("delete_as_spam_marks_as_read", "", False,
-      """""",
-      BOOLEAN, RESTORE),
- 
-     ("rescore", "", True,
-      """""",
-      BOOLEAN, RESTORE),
-   ),
-  
    "imap" : (
      ("server", "Server", (),
--- 807,810 ----
***************
*** 1025,1592 ****
  }
  
- class Option(object):
-     def __init__(self, name, nice_name="", default=None,
-                  help_text="", allowed=None, restore=True):
-         self.name = name
-         self.nice_name = nice_name
-         self.default_value = default
-         self.explanation_text = help_text
-         self.allowed_values = allowed
-         self.restore = restore
-         self.value = default
-         self.delimiter = None
- 
-     def display_name(self):
-         '''A name for the option suitable for display to a user.'''
-         return self.nice_name
-     def default(self):
-         '''The default value for the option.'''
-         return self.default_value
-     def doc(self):
-         '''Documentation for the option.'''
-         return self.explanation_text
-     def valid_input(self):
-         '''Valid values for the option.'''
-         return self.allowed_values
-     def no_restore(self):
-         '''Do not restore this option when restoring to defaults.'''
-         return not self.restore
-     def set(self, val):
-         '''Set option to value.'''
-         self.value = val
-     def get(self):
-         '''Get option value.'''
-         return self.value
-     def multiple_values_allowed(self):
-         '''Multiple values are allowed for this option.'''
-         return type(self.value) == types.TupleType
-     
-     def is_valid(self, value):
-         '''Check if this is a valid value for this option.'''
- # XXX This test is in the original code, but makes no sense....
- # XXX self.allowed_values defaults to None, and if that is the
- # XXX current value, then whatever is passed would be invalid
- # XXX I agree this is a silly state to be in, but it is possible
- # XXX I suppose that self.allowed_values should default to *any*
- # XXX rather than None, but I'm not sure how to express that,
- # XXX unless the regex r"." is correct.
-         if self.allowed_values is None:
-             return False
- 
-         if type(self.value) == types.TupleType:
-             return self.is_valid_multiple(value)
-         else:
-             return self.is_valid_single(value)
- 
-     def is_valid_multiple(self, value):
-         '''Return True iff value is a valid value for this option.
-         Use if multiple values are allowed.'''
-         if type(value) == types.TupleType:
-             for val in value:
-                 if not self.is_valid_single(val):
-                     return False
-             return True
-         return self.is_valid_single(value)
- 
-     def is_valid_single(self, value):
-         '''Return True iff value is a valid value for this option.
-         Use when multiple values are not allowed.'''
-         if type(self.allowed_values) == types.TupleType:
-             if value in self.allowed_values:
-                 return True
-             else:
-                 return False
-         else:
-             # special handling for booleans, thanks to Python 2.2
-             if self.is_boolean and (value == True or value == False):
-                 return True
-             if type(value) != type(self.value) and \
-                type(self.value) != types.TupleType:
-                 # This is very strict!  If the value is meant to be
-                 # a real number and an integer is passed in, it will fail.
-                 # (So pass 1. instead of 1, for example)
-                 return False
-             avals = self._split_values(value)
-             # in this case, allowed_values must be a regex, and
-             # _split_values must match once and only once
-             if len(avals) == 1:
-                 return True
-             else:
-                 # either no match or too many matches
-                 return False
-             
-     def _split_values(self, value):
-         # do the regex mojo here
-         try:
-             r = re.compile(self.allowed_values)
-         except:
-             print self.allowed_values
-             raise
-         s = str(value)
-         i = 0
-         vals = ()
-         while True:
-             m = r.search(s[i:])
-             if m is None:
-                 break
-             vals += (m.group(),)
-             delimiter = s[i:i + m.start()]
-             if self.delimiter is None and delimiter != "":
-                 self.delimiter = delimiter
-             i += m.end()
-         return vals
- 
-     def as_nice_string(self, section=None):
-         '''Summarise the option in a user-readable format.'''
-         if section is None:
-             strval = ""
-         else:
-             strval = "[%s] " % (section)
-         strval += "%s - \"%s\"\nDefault: %s\nDo not restore: %s\n" \
-                  % (self.name, self.display_name(),
-                     str(self.default()), str(self.no_restore()))
-         strval += "Valid values: %s\nMultiple values allowed: %s\n" \
-                   % (str(self.valid_input()),
-                      str(self.multiple_values_allowed()))
-         strval += "\"%s\"\n\n" % (str(self.doc()))
-         return strval
- 
-     def write_config(self, file):
-         '''Output value in configuration file format.'''
-         file.write(self.name)
-         file.write(': ')
-         file.write(self.unconvert())
-         file.write('\n')
- 
-     def convert(self, value):
-         '''Convert value from a string to the appropriate type.'''
-         svt = type(self.value)
-         if svt == type(value):
-             # already the correct type
-             return value
-         if self.is_boolean():
-             if str(value) == "True" or value == 1:
-                 return True
-             elif str(value) == "False" or value == 0:
-                 return False
-             raise TypeError, self.name + " must be True or False"
-         if self.multiple_values_allowed():
-             # This will fall apart if the allowed_value is a tuple,
-             # but not a homogenous one...
-             if type(self.allowed_values) in types.StringTypes:
-                 vals = list(self._split_values(value))
-             else:
-                 vals = value.split()
-             if len(self.default_value) > 0:
-                 to_type = type(self.default_value[0])
-             else:
-                 to_type = types.StringType
-             for i in range(0, len(vals)):
-                 vals[i] = self._convert(vals[i], to_type)
-             return tuple(vals)
-         else:
-             return self._convert(value, svt)
-         raise TypeError, self.name + " has an invalid type."
- 
-     def _convert(self, value, to_type):
-         '''Convert an int, float or string to the specified type.'''
-         if to_type == type(value):
-             # already the correct type
-             return value
-         if to_type == types.IntType:
-             return locale.atoi(value)
-         if to_type == types.FloatType:
-             return locale.atof(value)
-         if to_type in types.StringTypes:
-             return str(value)
-         raise TypeError, "Invalid type."
- 
-     def unconvert(self):
-         '''Convert value from the appropriate type to a string.'''
-         if type(self.value) in types.StringTypes:
-             # nothing to do
-             return self.value
-         if self.is_boolean():
-             # A wee bit extra for Python 2.2
-             if self.value == True:
-                 return "True"
-             else:
-                 return "False"
-         if type(self.value) == types.TupleType:
-             if len(self.value) == 0:
-                 return ""
-             if len(self.value) == 1:
-                 v = self.value[0]
-                 if type(v) == types.FloatType:
-                     return locale.str(self.value[0])
-                 return str(v)
-             # We need to separate out the items
-             strval = ""
-             # We use a character that is invalid as the separator
-             # so that it will reparse correctly.  We could try all
-             # characters, but we make do with this set of commonly
-             # used ones - note that the first one that works will
-             # be used.  Perhaps a nicer solution than this would be
-             # to specifiy a valid delimiter for all options that
-             # can have multiple values.  Note that we have None at
-             # the end so that this will crash and die if none of
-             # the separators works <wink>.
-             if self.delimiter is None:
-                 if type(self.allowed_values) == types.TupleType:
-                     self.delimiter = ' '
-                 else:
-                     v0 = self.value[0]
-                     v1 = self.value[1]
-                     for sep in [' ', ',', ':', ';', '/', '\\', None]:
-                         # we know at this point that len(self.value) is at
-                         # least two, because len==0 and len==1 were dealt
-                         # with as special cases
-                         test_str = str(v0) + sep + str(v1)
-                         test_tuple = self._split_values(test_str)
-                         if test_tuple[0] == str(v0) and \
-                            test_tuple[1] == str(v1) and \
-                            len(test_tuple) == 2:
-                             break
-                     # cache this so we don't always need to do the above
-                     self.delimiter = sep
-             for v in self.value:
-                 if type(v) == types.FloatType:
-                     v = locale.str(v)
-                 else:
-                     v = str(v)
-                 strval += v + self.delimiter
-             strval = strval[:-len(self.delimiter)] # trailing seperator
-         else:
-             # Otherwise, we just hope str() will do the job
-             strval = str(self.value)
-         return strval
- 
-     def is_boolean(self):
-         '''Return True iff the option is a boolean value.'''
-         # This is necessary because of the Python 2.2 True=1, False=0
-         # cheat.  The valid values are returned as 0 and 1, even if
-         # they are actually False and True - but 0 and 1 are not
-         # considered valid input (and 0 and 1 don't look as nice)
-         # So, just for the 2.2 people, we have this helper function
-         try:
-             if type(self.allowed_values) == types.TupleType and \
-                len(self.allowed_values) > 0 and \
-                type(self.allowed_values[0]) == types.BooleanType:
-                 return True
-             return False
-         except AttributeError:
-             # If the user has Python 2.2 and an option has valid values
-             # of (0, 1) - i.e. integers, then this function will return
-             # the wrong value.  I don't know what to do about that without
-             # explicitly stating which options are boolean
-             if self.allowed_values == (False, True):
-                 return True
-             return False
- 
- 
- class OptionsClass(object):
-     def __init__(self):
-         self._options = {}
- 
-     #
-     # Regular expressions for parsing section headers and options.
-     # Lifted straight from ConfigParser
-     #
-     SECTCRE = re.compile(
-         r'\['                                 # [
-         r'(?P<header>[^]]+)'                  # very permissive!
-         r'\]'                                 # ]
-         )
-     OPTCRE = re.compile(
-         r'(?P<option>[^:=\s][^:=]*)'          # very permissive!
-         r'\s*(?P<vi>[:=])\s*'                 # any number of space/tab,
-                                               # followed by separator
-                                               # (either : or =), followed
-                                               # by any # space/tab
-         r'(?P<value>.*)$'                     # everything up to EOL
-         )
- 
-     def update_file(self, filename):
-         '''Update the specified configuration file.'''
-         sectname = None
-         optname = None
-         out = TemporaryFile()
-         if os.path.exists(filename):
-             f = file(filename, "r")
-         else:
-             # doesn't exist, so create it - all the changed options will
-             # be added to it
-             if options["globals", "verbose"]:
-                 print "Creating new configuration file", filename
-             f = file(filename, "w")
-             f.close()
-             f = file(filename, "r")
-         written = []
-         vi = ": " # default; uses the one from the file where possible
-         while True:
-             line = f.readline()
-             if not line:
-                 break
-             # comment or blank line?
-             if line.strip() == '' or line[0] in '#;':
-                 out.write(line)
-                 continue
-             if line.split(None, 1)[0].lower() == 'rem' and line[0] in "rR":
-                 # no leading whitespace
-                 out.write(line)
-                 continue
-             # continuation line?
-             if line[0].isspace() and sectname is not None and optname:
-                 continue
-             # a section header or option header?
-             else:
-                 # is it a section header?
-                 mo = self.SECTCRE.match(line)
-                 if mo:
-                     # Add any missing from the previous section
-                     if sectname is not None:
-                         self._add_missing(out, written, sectname, vi, False)
-                     sectname = mo.group('header')
-                     # So sections can't start with a continuation line
-                     optname = None
-                     if sectname in self.sections():
-                         out.write(line)
-                 # an option line?
-                 else:
-                     mo = self.OPTCRE.match(line)
-                     if mo:
-                         optname, vi, optval = mo.group('option', 'vi', 'value')
-                         if vi in ('=', ':') and ';' in optval:
-                             # ';' is a comment delimiter only if it follows
-                             # a spacing character
-                             pos = optval.find(';')
-                             if pos != -1 and optval[pos-1].isspace():
-                                 optval = optval[:pos]
-                         optval = optval.strip()
-                         # allow empty values
-                         if optval == '""':
-                             optval = ''
-                         optname = optname.rstrip().lower()
-                         if self._options.has_key((sectname, optname)):
-                             out.write(optname)
-                             out.write(vi)
-                             out.write(self.unconvert(sectname, optname))
-                             out.write('\n')
-                             written.append((sectname, optname))
-         for sect in self.sections():
-             self._add_missing(out, written, sect, vi)
-         f.close()
-         out.flush()
-         if options["globals", "verbose"]:
-             # save a backup of the old file
-             shutil.copyfile(filename, filename + ".bak")
-         # copy the new file across
-         f = file(filename, "w")
-         out.seek(0)
-         shutil.copyfileobj(out, f)
-         out.close()
-         f.close()
-     
-     def _add_missing(self, out, written, sect, vi, label=True):
-         # add any missing ones, where the value does not equal the default
-         for opt in self.options_in_section(sect):
-             if not (sect, opt) in written and \
-                self.get(sect, opt) != self.default(sect, opt):
-                 if label:
-                     out.write('[')
-                     out.write(sect)
-                     out.write("]\n")
-                     label = False
-                 out.write(opt)
-                 out.write(vi)
-                 out.write(self.unconvert(sect, opt))
-                 out.write('\n')
-                 written.append((sect, opt))
- 
-     def load_defaults(self):
-         '''Load default values (stored in this module).'''
-         for section, opts in defaults.items():
-             for opt in opts:
-                 o = Option(opt[0], opt[1], opt[2], opt[3], opt[4], opt[5])
-                 self._options[section, opt[0]] = o
-                 # start with default value
-                 o.set(opt[2])
-                 # A (really ugly) bit of backwards compatability
-                 # *** This will vanish soon, so do not make use of it in
-                 #     new code ***
-                 self._oldset(section, opt[0], opt[2])
- 
-     def _oldset(self, section, option, value):
-         # A (really ugly) bit of backwards compatability
-         # *** This will vanish soon, so do not make use of it in
-         #     new code ***
-         for (oldsect, oldopt), (newsect, newopt) in conversion_table.items():
-             if (newsect, newopt) == (section, option):
-                 section = oldsect
-                 option = oldopt
-         setattr(options, option, value)
-         old_name = section[0:1].lower() + section[1:] + "_" + option
-         setattr(options, old_name, value)
-                 
-     def merge_files(self, file_list):
-         for file in file_list:
-             self.merge_file(file)
- 
-     def merge_file(self, filename):
-         import ConfigParser
-         c = ConfigParser.ConfigParser()
-         c.read(filename)
-         for sect in c.sections():
-             for opt in c.options(sect):
-                 value = c.get(sect, opt)
-                 # backward compatibility guff
-                 if opt[:len(sect) + 1].lower() == sect.lower() + '_':
-                     opt = opt[len(sect)+1:]
-                 if conversion_table.has_key((sect, opt)):
-                     section, option = conversion_table[sect, opt]
-                 else:
-                     section = sect
-                     option = opt
-                 # end of backward compatibility guff
-                 if not self._options.has_key((section, option)):
-                     print "Invalid option %s in section %s in file %s" % \
-                           (opt, sect, filename)
-                 else:
-                     if self.multiple_values_allowed(section, option):
-                         value = self.convert(section, option, value)
-                     value = self.convert(section, option, value)
-                     self.set(section, option, value)
-                     # backward compatibility guff
-                     self._oldset(sect, opt, value)
-                     # end of backward compatibility guff
- 
-     # not strictly necessary, but convenient shortcuts to self._options
-     def display_name(self, sect, opt):
-         '''A name for the option suitable for display to a user.'''
-         return self._options[sect, opt].display_name()
-     def default(self, sect, opt):
-         '''The default value for the option.'''
-         return self._options[sect, opt].default()
-     def doc(self, sect, opt):
-         '''Documentation for the option.'''
-         return self._options[sect, opt].doc()
-     def valid_input(self, sect, opt):
-         '''Valid values for the option.'''
-         return self._options[sect, opt].valid_input()
-     def no_restore(self, sect, opt):
-         '''Do not restore this option when restoring to defaults.'''
-         return self._options[sect, opt].no_restore()
-     def is_valid(self, sect, opt, value):
-         '''Check if this is a valid value for this option.'''
-         return self._options[sect, opt].is_valid(value)
-     def multiple_values_allowed(self, sect, opt):
-         '''Multiple values are allowed for this option.'''
-         return self._options[sect, opt].multiple_values_allowed()
- 
-     def is_boolean(self, sect, opt):
-         '''The option is a boolean value. (Support for Python 2.2).'''
-         return self._options[sect, opt].is_boolean()
- 
-     def convert(self, sect, opt, value):
-         '''Convert value from a string to the appropriate type.'''
-         return self._options[sect, opt].convert(value)
- 
-     def unconvert(self, sect, opt):
-         '''Convert value from the appropriate type to a string.'''
-         return self._options[sect, opt].unconvert()
- 
-     def get(self, sect, opt):
-         '''Get an option.'''
-         if conversion_table.has_key((sect, opt)):
-             sect, opt = conversion_table[sect, opt]
-         return self._options[sect, opt].get()
- 
-     def __getitem__(self, key):
-         return self.get(key[0], key[1])
- 
-     def set(self, sect, opt, val=None):
-         '''Set an option.'''
-         if conversion_table.has_key((sect, opt)):
-             sect, opt = conversion_table[sect, opt]
-         if self.is_valid(sect, opt, val):
-             self._options[sect, opt].set(val)
-             # backwards compatibility stuff
-             self._oldset(sect, opt, val)
-         else:
-             print "Attempted to set [%s] %s with invalid value %s (%s)" % \
-                   (sect, opt, val, type(val))
-         
-     def __setitem__(self, key, value):
-         self.set(key[0], key[1], value)
- 
-     def sections(self):
-         '''Return an alphabetical list of all the sections.'''
-         all = []
-         for sect, opt in self._options.keys():
-             if sect not in all:
-                 all.append(sect)
-         all.sort()
-         return all
-     
-     def options_in_section(self, section):
-         '''Return an alphabetical list of all the options in this section.'''
-         all = []
-         for sect, opt in self._options.keys():
-             if sect == section:
-                 all.append(opt)
-         all.sort()
-         return all
- 
-     def options(self, prepend_section_name=False):
-         '''Return a alphabetical list of all the options, optionally
-         prefixed with [section_name]'''
-         all = []
-         for sect, opt in self._options.keys():
-             if prepend_section_name:
-                 all.append('[' + sect + ']' + opt)
-             else:
-                 all.append(opt)
-         all.sort()
-         return all
- 
-     def display(self):
-         '''Display options in a config file form.'''
-         output = StringIO.StringIO()
-         keys = self._options.keys()
-         keys.sort()
-         currentSection = None
-         for sect, opt in keys:
-             if sect != currentSection:
-                 if currentSection is not None:
-                     output.write('\n')
-                 output.write('[')
-                 output.write(sect)
-                 output.write("]\n")
-                 currentSection = sect
-             self._options[sect, opt].write_config(output)
-         return output.getvalue()
- 
-     def display_full(self, section=None, option=None):
-        '''Display options including all information.'''
-        # Given that the Options class is no longer as nice looking
-        # as it once was, this returns all the information, i.e.
-        # the doc, default values, and so on
-        output = StringIO.StringIO()
- 
-        # when section and option are both specified, this
-        # is nothing more than a call to as_nice_string
-        if section is not None and option is not None:
-            output.write(self._options[section,
-                                       option].as_nice_string(section))
-            return output.getvalue()
-        
-        all = self._options.keys()
-        all.sort()
-        for sect, opt in all:
-            if section is not None and sect != section:
-                continue
-            output.write(self._options[sect, opt].as_nice_string(sect))
-        return output.getvalue()
- 
  
  # `optionsPathname` is the pathname of the last ini file in the list.
--- 888,891 ----
***************
*** 1597,1601 ****
  
  options = OptionsClass()
! options.load_defaults()
  
  alternate = None
--- 896,901 ----
  
  options = OptionsClass()
! options.conversion_table = conversion_table # Our b/w compat hacks
! options.load_defaults(defaults)
  
  alternate = None
***************
*** 1618,1619 ****
--- 918,921 ----
  if not optionsPathname:
      optionsPathname = os.path.abspath('bayescustomize.ini')
+ # Set verbosity of this options instance to an option value!
+ options.verbose = options["globals", "verbose"]



From mhammond at users.sourceforge.net  Sun Jun 15 21:50:16 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Sun Jun 15 23:50:21 2003
Subject: [Spambayes-checkins] spambayes/spambayes OptionsClass.py,1.1,1.2
Message-ID: <E19Rl0a-0001ff-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	OptionsClass.py 
Log Message:
Get the name of the module in the comments right:)


Index: OptionsClass.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/OptionsClass.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OptionsClass.py	16 Jun 2003 03:46:13 -0000	1.1
--- OptionsClass.py	16 Jun 2003 03:50:14 -0000	1.2
***************
*** 1,3 ****
! """OptionsCore
  
  Classes:
--- 1,3 ----
! """OptionsClass
  
  Classes:



From mhammond at users.sourceforge.net  Sun Jun 15 21:54:43 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Sun Jun 15 23:54:45 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000/dialogs
	TrainingDialog.py, 1.12, 1.13
Message-ID: <E19Rl4t-0001qC-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	TrainingDialog.py 
Log Message:
Instead of suggesting the inbox, suggest folders we watch.


Index: TrainingDialog.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/TrainingDialog.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** TrainingDialog.py	17 Mar 2003 01:23:54 -0000	1.12
--- TrainingDialog.py	16 Jun 2003 03:54:40 -0000	1.13
***************
*** 73,80 ****
      def UpdateStatus(self):
          # Set some defaults.
!         # If we have no known ham folders, suggest the Inbox.
          if len(self.config.ham_folder_ids)==0 and self.mgr.outlook is not None:
!             inbox = self.mgr.outlook.Session.GetDefaultFolder(constants.olFolderInbox)
!             self.config.ham_folder_ids = [(inbox.StoreID, inbox.EntryID)]
          # If we have no known spam folders, but do have a spam folder
          # defined in the filters, use it.
--- 73,79 ----
      def UpdateStatus(self):
          # Set some defaults.
!         # If we have no known ham folders, suggest the folder we watch
          if len(self.config.ham_folder_ids)==0 and self.mgr.outlook is not None:
!             self.config.ham_folder_ids = self.mgr.config.filter.watch_folder_ids[:]
          # If we have no known spam folders, but do have a spam folder
          # defined in the filters, use it.



From mhammond at users.sourceforge.net  Sun Jun 15 22:51:32 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Mon Jun 16 00:51:35 2003
Subject: [Spambayes-checkins] 
	spambayes/Outlook2000/sandbox dump_profiles.py, NONE, 1.1
Message-ID: <E19Rlxs-0004Ya-00@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	dump_profiles.py 
Log Message:
Little bit of test code worth saving for later when everyone complains
the profile detection code is wrong


--- NEW FILE: dump_profiles.py ---

from win32com.client import Dispatch
from win32com.mapi import mapi, exchange
from win32com.mapi.mapitags import *

mapi.MAPIInitialize(None)
logonFlags = mapi.MAPI_NO_MAIL | mapi.MAPI_EXTENDED
session = mapi.MAPILogonEx(0, None, None, logonFlags)

MAPI_SUBSYSTEM = 39

restriction = mapi.RES_PROPERTY, (mapi.RELOP_EQ, PR_RESOURCE_TYPE, (PR_RESOURCE_TYPE,MAPI_SUBSYSTEM))
table = session.GetStatusTable(0)
rows = mapi.HrQueryAllRows(table,
                            (PR_DISPLAY_NAME_A,),   # columns to retrieve
                            restriction,     # only these rows
                            None,            # any sort order is fine
                            0)               # any # of results is fine
assert len(rows)==1, "Should be exactly one row"
(tag, val), = rows[0]
print "Profile name:", val



From mhammond at users.sourceforge.net  Sun Jun 15 23:00:26 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Mon Jun 16 01:00:29 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000 addin.py, 1.59,
	1.60 config.py, 1.8, 1.9 filter.py, 1.22, 1.23 manager.py,
	1.59, 1.60 msgstore.py, 1.45, 1.46
Message-ID: <E19Rm6U-0004wW-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	addin.py config.py filter.py manager.py msgstore.py 
Log Message:
Change "Anti-Spam" on the dropdown to "SpamBayes"

Huge changes to configuration.  No longer use a pickle, but instead a series
of .INI files (in the format of the default bayes file - but *not* using 
the bayes ini file).  We automatically migrate the old pickle file to the
new INI file.

This is very cool as it allows us to support options before we have a UI
for it.  A first such option is a "data_directory", which would allow
site administrators to specify a different per-user directory.  Some
other options are likely to appear soon.

Source-code users will note the creation of "unknown_profile.ini" - this is
because released win32alls currently can not determine the Outlook profile 
name. When it can, this file will magically be renamed to the correct profile 
name. The next binary release will know the profile name immediately, so will
never see "unknown_profile.ini".  (This is used so SpamBayes can
eventually be used with multiple profiles - currently it fails pretty 
badly)



Index: addin.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/addin.py,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** addin.py	6 Jun 2003 04:01:51 -0000	1.59
--- addin.py	16 Jun 2003 05:00:22 -0000	1.60
***************
*** 154,158 ****
  # outlook one
  def ProcessMessage(msgstore_message, manager):
!     if msgstore_message.GetField(manager.config.field_score_name) is not None:
          # Already seem this message - user probably moving it back
          # after incorrect classification.
--- 154,158 ----
  # outlook one
  def ProcessMessage(msgstore_message, manager):
!     if msgstore_message.GetField(manager.config.general.field_score_name) is not None:
          # Already seem this message - user probably moving it back
          # after incorrect classification.
***************
*** 224,228 ****
              return
          msgstore_message = self.manager.message_store.GetMessage(item)
!         prop = msgstore_message.GetField(self.manager.config.field_score_name)
          if prop is not None:
              import train
--- 224,228 ----
              return
          msgstore_message = self.manager.message_store.GetMessage(item)
!         prop = msgstore_message.GetField(self.manager.config.general.field_score_name)
          if prop is not None:
              import train
***************
*** 480,485 ****
                          constants.msoControlPopup,
                          None, None,
!                         Caption="Anti-Spam",
!                         TooltipText = "Anti-Spam filters and functions",
                          Enabled = True,
                          Tag = "SpamBayesCommand.Popup")
--- 480,485 ----
                          constants.msoControlPopup,
                          None, None,
!                         Caption="SpamBayes",
!                         TooltipText = "SpamBayes anti-spam filters and functions",
                          Enabled = True,
                          Tag = "SpamBayesCommand.Popup")
***************
*** 601,606 ****
      def OnActivate(self):
          # See comments for OnNewExplorer below.
!         # *sigh* - OnActivate seems too early too :(
!         pass
  
      def OnSelectionChange(self):
--- 601,610 ----
      def OnActivate(self):
          # See comments for OnNewExplorer below.
!         # *sigh* - OnActivate seems too early too for Outlook 2000,
!         # but Outlook 2003 seems to work here, and *not* the folder switch etc
!         # This also appears to solve some issues relating to multi-profiles
!         # on 2000 (where secondary profiles appears to behave closer to 2003)
!         if not self.have_setup_ui:
!             self.SetupUI() 
  
      def OnSelectionChange(self):
***************
*** 730,733 ****
--- 734,751 ----
      
              if self.manager.config.filter.enabled:
+                 # A little "sanity test" to help the user.  If our status is
+                 # 'enabled', then it means we have previously managed to
+                 # convince the manager dialog we have enough ham/spam and
+                 # valid folders.  If for some reason, we have zero ham or spam,
+                 # or no folder definitions but are 'enabled', then it is likely
+                 # something got hosed and the user doesn't know.
+                 if self.manager.bayes.nham==0 or \
+                    self.manager.bayes.nspam==0 or \
+                    not self.manager.config.filter.spam_folder_id or \
+                    not self.manager.config.filter.watch_folder_ids:
+                     msg = "It appears there was an error loading your configuration\r\n\r\n" \
+                           "Please re-configure SpamBayes via the SpamBayes dropdown"
+                     self.manager.ReportError(msg)
+                 # But continue on regardless.
                  self.FiltersChanged()
                  try:
***************
*** 748,752 ****
          config = self.manager.config.filter
          manager = self.manager
!         field_name = manager.config.field_score_name
          for folder in manager.message_store.GetFolderGenerator(
                                      config.watch_folder_ids,
--- 766,770 ----
          config = self.manager.config.filter
          manager = self.manager
!         field_name = manager.config.general.field_score_name
          for folder in manager.message_store.GetFolderGenerator(
                                      config.watch_folder_ids,

Index: config.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/config.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** config.py	18 Mar 2003 02:50:02 -0000	1.8
--- config.py	16 Jun 2003 05:00:23 -0000	1.9
***************
*** 1,5 ****
! # configuration stuff we persist via a pickle
! # Can't be defined in any module that may be used as "__main__"
! # or as a module.
  
  try:
--- 1,15 ----
! # configuration classes for the plugin.
! # We used to use a little pickle, but have since moved to a "spambayes.Options"
! # class.
! 
! # Hack for testing - setup sys.path
! if __name__=='__main__':
!     try:
!         import spambayes.Options
!     except ImportError:
!         import sys, os
!         sys.path.append(os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "..")))
! 
! import sys, types
  
  try:
***************
*** 7,36 ****
  except NameError:
      # Maintain compatibility with Python 2.2
!     True, False = 1, 0
  
  
! class _ConfigurationContainer:
!     def __init__(self, **kw):
!         self.__dict__.update(kw)
  
!     def __setattr__(self, attr, val):
!         if not self.__dict__.has_key(attr):
!             raise AttributeError, attr
!         self.__dict__[attr] = val
!     # Crap state-loading code so when we load an early version of the pickle
!     # any attributes in the new version are considered defaults.
!     # XXX - I really really want a better scheme than pickles etc here :(
!     def _update_from(self, dict):
!         for name, val in dict.items():
!             updater = getattr(val, "_update_from", None)
!             if updater is not None and self.__dict__.has_key(name):
!                 self.__dict__[name]._update_from(val.__dict__)
              else:
!                 self.__dict__[name] = val
  
!     def __setstate__(self, state):
!         self.__init__() # ensure any new/default values setup
!         self._update_from(state)
  
      def _dump(self, thisname="<root>", level=0):
          import pprint
--- 17,219 ----
  except NameError:
      # Maintain compatibility with Python 2.2
!     True, False = 0==0, 1==0
  
  
! FOLDER_ID = r"\(\'[a-fA-F0-9]+\', \'[a-fA-F0-9]+\'\)"
! FIELD_NAME = r"[a-zA-Z0-9 ]+"
! FILTER_ACTION = "Untouched", "Moved", "Copied"
  
! from spambayes.OptionsClass import OptionsClass, Option
! from spambayes.OptionsClass import RESTORE, DO_NOT_RESTORE
! from spambayes.OptionsClass import BOOLEAN, REAL, PATH
! 
! class FolderIDOption(Option):
!     def convert(self, value):
!         #print "Convert called on", repr(value)
!         error = None
!         is_multi = self.multiple_values_allowed()
!         # empty string means nothing to single value.
!         if not is_multi and not value:
!             return None
!         # Now sure why we get non-strings here for multis
!         if type(value) == types.ListType:
!             return value
!         # If we really care here, it would be fairly easy to use a regex
!         # etc to pull these IDs apart.  eval is easier for now :)
!         try:
!             items = eval(value)
!         except:
!             error = "Invalid value (%s:%s)" % (sys.exc_type, sys.exc_value)
!         check_items = []
!         if error is None:
!             if is_multi:
!                 if type(items) != types.ListType:
!                     error = "Multi-valued ID must yield a list"
!                 check_items = items
              else:
!                 check_items = [items]
!         if error is None:
!             for item in check_items:
!                 if item is None:
!                     error = "None isn't valid here (how did it get here anyway?"
!                     break
!                 if not self.is_valid_single(item):
!                     error = "Each ID must be a tuple of 2 strings"
!                     break
!         if error is not None:
!             print "Failed to convert FolderID value '%r', is_multi=%d" % \
!                   (value, is_multi)
!             print error
!             if is_multi:
!                 return []
!             else:
!                 return None
!         return items
  
!     def unconvert(self):
!         #print "unconvert called with", repr(self.value)
!         if self.value is None:
!             return ""
!         return str(self.value)
!     
!     def is_valid_single(self, value):
!         return value is None or \
!                (type(value)==types.TupleType and \
!                len(value)==2 and \
!                type(value[0])==type(value[1])==types.StringType)
! 
! defaults = {
!     "General" : (
!     ("field_score_name", "The name of the field used to store the spam score", "Spam",
!         """SpamBayes stores the spam score for each message in a custom field.
!         This option specifies the name of the field""",
!         FIELD_NAME, RESTORE),
!     ("data_directory", "The directory to store the data files.", "",
!         """""",
!         PATH, RESTORE),
!     ),
!     "Training" : (
!     (FolderIDOption,
!         "ham_folder_ids", "Folders containing known good messages", [],
!         """A list of folders known to contain good (ham) messages.  When SpamBayes
!         is trained, these messages will be used as examples of good messages.""",
!         FOLDER_ID, DO_NOT_RESTORE),
!     ("ham_include_sub", "Does the nominated ham folders include sub-folders?", False,
!         """""",
!         BOOLEAN, DO_NOT_RESTORE),
!     (FolderIDOption,
!         "spam_folder_ids", "Folders containing known bad or spam messages", [],
!         """A list of folders known to contain bad (spam) messages.  When SpamBayes
!         is trained, these messages will be used as examples of messages to filter.""",
!         FOLDER_ID, DO_NOT_RESTORE),
!     ("spam_include_sub", "Does the nominated spam folders include sub-folders?", False,
!         """""",
!         BOOLEAN, DO_NOT_RESTORE),
!     ("train_recovered_spam", "Train as good as items are recovered?", True,
!         """SpamBayes can detect when a message previously classified as spam
!         (or unsure) is moved back to the folder from which it was filtered.
!         If this option is enabled, SpamBayes will automatically train on
!         such messages""",
!         BOOLEAN, RESTORE),
!     ("train_manual_spam", "Train as spam items are manually moved?", True,
!         """SpamBayes can detect when a message previously classified as good
!         (or unsure) is manually moved to the Spam folder.  If this option is
!         enabled, SpamBayes will automatically train on such messages""",
!         BOOLEAN, RESTORE),
!     ("rescore", "Rescore message after training?", True,
!         """State of the 'rescore' button""",
!         BOOLEAN, RESTORE),
!     ),
  
+     # These options control how a message is categorized
+     "Filter" : (
+     ("filter_now", "State of 'Filter Now' checkbox", False,
+         """Something useful.""",
+         BOOLEAN, RESTORE),
+     (FolderIDOption,
+        "watch_folder_ids", "Folders to watch for new messages", [],
+         """The list of folders SpamBayes will watch for new messages,
+         processing messages as defined by the filters.""",
+         FOLDER_ID, DO_NOT_RESTORE),
+     ("watch_include_sub", "Does the nominated watch folders include sub-folders?", False,
+         """""",
+         BOOLEAN, DO_NOT_RESTORE),
+     (FolderIDOption,
+         "spam_folder_id", "The folder used to track spam", None,
+         """The folder SpamBayes moves or copies spam to.""",
+         FOLDER_ID, DO_NOT_RESTORE),
+     ("spam_threshold", "The score necessary to be considered 'certain' spam", 90.0,
+         """""",
+         REAL, RESTORE),
+     ("spam_action", "The action to take for new spam", "Untouched",
+         """""",
+         FILTER_ACTION, RESTORE),
+     (FolderIDOption,
+         "unsure_folder_id", "The folder used to track uncertain messages", None,
+         """The folder SpamBayes moves or copies uncertain messages to.""",
+         FOLDER_ID, DO_NOT_RESTORE),
+     ("unsure_threshold", "The score necessary to be considered 'unsure'", 15.0,
+         """""",
+         REAL, RESTORE),
+     ("unsure_action", "The action to take for new uncertain messages", "Untouched",
+         """""",
+         FILTER_ACTION, RESTORE),
+     ("enabled", "Is filtering enabled?", False,
+         """""",
+         BOOLEAN, RESTORE),
+     ),
+     "Filter_Now": (
+     (FolderIDOption, "folder_ids", "Folders to filter in a 'Filter Now' operation", [],
+         """""",
+         FOLDER_ID, DO_NOT_RESTORE),
+     ("include_sub", "Does the nominated folders include sub-folders?", False,
+         """""",
+         BOOLEAN, DO_NOT_RESTORE),
+     ("only_unread", "Only filter unread messages?", False,
+         """""",
+         BOOLEAN, RESTORE),
+     ("only_unseen", "Only filter previously unseen ?", False,
+         """""",
+         BOOLEAN, RESTORE),
+     ("action_all", "Perform all filter actions?", True,
+         """""",
+         BOOLEAN, RESTORE),
+     ),
+ }
+ 
+ # A simple container that provides "." access to items
+ class SectionContainer:
+     def __init__(self, options, section):
+         self.__dict__['_options'] = options
+         self.__dict__['_section'] = section
+     def __getattr__(self, attr):
+         return self._options.get(self._section, attr)
+     def __setattr__(self, attr, val):
+         return self._options.set(self._section, attr, val)
+ 
+ class OptionsContainer:
+     def __init__(self, options):
+         self.__dict__['_options'] = options
+     def __getattr__(self, attr):
+         attr = attr.lower()
+         for key in self._options.sections():
+             if attr == key.lower():
+                 container = SectionContainer(self._options, key)
+                 self.__dict__[attr] = container
+                 return container
+         raise AttributeError, "Options has no section '%s'" % attr
+ 
+ def CreateConfig():
+     options = OptionsClass()
+     options.load_defaults(defaults)
+     return options
+ 
+ # Old code when we used a pickle.  Still needed so old pickles can be
+ # loaded, and moved to the new options file format.
+ class _ConfigurationContainer:
+     def __init__(self, **kw):
+         self.__dict__.update(kw)
+     def __setstate__(self, state):
+         self.__dict__.update(state)
      def _dump(self, thisname="<root>", level=0):
          import pprint
***************
*** 46,86 ****
  class ConfigurationRoot(_ConfigurationContainer):
      def __init__(self):
!         training = _ConfigurationContainer(
!             ham_folder_ids = [],
!             ham_include_sub = False,
!             spam_folder_ids = [],
!             spam_include_sub = False,
!             # Train as unsure/spam is moved back to Inbox
!             train_recovered_spam = True,
!             # Train as stuff dragged into spam folders.
!             train_manual_spam = True,
!             # Rescore all messages after training?
!             rescore = True,
!             )
!         filter = _ConfigurationContainer(
!             watch_folder_ids = [],
!             watch_include_sub = False,
!             spam_folder_id = None,
!             spam_threshold = 90,
!             spam_action = "Untouched",
!             unsure_folder_id = None,
!             unsure_threshold = 15,
!             unsure_action = "Untouched",
!             enabled = False,
!             )
!         filter_now = _ConfigurationContainer(
!             folder_ids = [],
!             include_sub = False,
!             only_unread = False,
!             only_unseen = True,
!             action_all = True,
!             )
!         field_score_name = "Spam"
!         _ConfigurationContainer.__init__(self,
!                                          training=training,
!                                          filter=filter,
!                                          filter_now = filter_now,
!                                          field_score_name = field_score_name)
! 
  if __name__=='__main__':
!     print "Please run 'manager.py'"
--- 229,269 ----
  class ConfigurationRoot(_ConfigurationContainer):
      def __init__(self):
!         pass
! # End of old pickle code.
!     
  if __name__=='__main__':
!     options = CreateConfig()
!     options.merge_files(['delme.cfg'])
!     c = OptionsContainer(options)
!     f = options.get("Training", "ham_folder_ids")
!     print "Folders before set are", f
!     for i in f:
!         print i, type(i)
!     new_folder_ids = [('000123','456789'), ('ABCDEF', 'FEDCBA')]
!     options.set("Training", "ham_folder_ids", new_folder_ids)
!     f = options.get("Training", "ham_folder_ids")
!     print "Folders after set are", f
!     for i in f:
!         print i, type(i)
!     
!     # Test single ID folders.
!     if c.filter.unsure_folder_id is not None:
!         print "It appears we loaded a folder ID - resetting"
!         c.filter.unsure_folder_id = None
!     unsure_id = c.filter.unsure_folder_id
!     if unsure_id is not None: raise ValueError, "unsure_id wrong (%r)" % (c.filter.unsure_folder_id,)
!     unsure_id = c.filter.unsure_folder_id = ('12345', 'abcdef')
!     if unsure_id != c.filter.unsure_folder_id: raise ValueError, "unsure_id wrong (%r)" % (c.filter.unsure_folder_id,)
!     c.filter.unsure_folder_id = None
!     if c.filter.unsure_folder_id is not None: raise ValueError, "unsure_id wrong (%r)" % (c.filter.unsure_folder_id,)
!     
!     options.set("Filter", "filter_now", True)
!     print "Filter_now from container is", c.filter.filter_now
!     options.set("Filter", "filter_now", False)
!     print "Filter_now from container is now", c.filter.filter_now
!     c.filter.filter_now = True
!     print "Filter_now from container is finally", c.filter.filter_now
!     print "Only unread is", c.filter_now.only_unread
!     options.update_file("delme.cfg")
!     print "Created 'delme.cfg'"
! 

Index: filter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/filter.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** filter.py	5 Jun 2003 00:50:10 -0000	1.22
--- filter.py	16 Jun 2003 05:00:23 -0000	1.23
***************
*** 33,37 ****
              # Catch this exception, as failing to save the score need not
              # be fatal - it may still be possible to perform the move.
!             msg.SetField(mgr.config.field_score_name, prob)
              # and the ID of the folder we were in when scored.
              # (but only if we want to perform all actions)
--- 33,37 ----
              # Catch this exception, as failing to save the score need not
              # be fatal - it may still be possible to perform the move.
!             msg.SetField(mgr.config.general.field_score_name, prob)
              # and the ID of the folder we were in when scored.
              # (but only if we want to perform all actions)
***************
*** 42,45 ****
--- 42,49 ----
              msg.Save()
          except:
+             # XXX - unfortunately, for the case I added this code, a failing
+             # Save *did* imply a failing Move :(
+             # I also heard a rumour hotmail works if we do 2 saves.
+             # This should be revisited.
              print "Failed to save the Spam score for message ", msg
              import traceback
***************
*** 82,85 ****
--- 86,90 ----
      all_actions = config.action_all
      dispositions = {}
+     field_name = mgr.config.general.field_score_name
      for message in f.GetMessageGenerator():
          if progress.stop_requested():
***************
*** 87,91 ****
          progress.tick()
          if only_unread and not message.unread or \
!            only_unseen and message.GetField(mgr.config.field_score_name) is not None:
              continue
          try:
--- 92,96 ----
          progress.tick()
          if only_unread and not message.unread or \
!            only_unseen and message.GetField(field_name) is not None:
              continue
          try:

Index: manager.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/manager.py,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** manager.py	4 Jun 2003 02:46:47 -0000	1.59
--- manager.py	16 Jun 2003 05:00:23 -0000	1.60
***************
*** 12,16 ****
  import pythoncom
  
- import config
  import msgstore
  
--- 12,15 ----
***************
*** 57,66 ****
  # first (if we import anything from the core spambayes code before
  # setting that envar, our .ini file may have no effect).
! def import_core_spambayes_stuff(ini_filename):
!     global bayes_classifier, bayes_tokenize, bayes_storage
! 
!     os.environ["BAYESCUSTOMIZE"] = ini_filename
      try:
!         from spambayes import classifier
      except ImportError:
          parent = os.path.abspath(os.path.join(os.path.dirname(this_filename),
--- 56,66 ----
  # first (if we import anything from the core spambayes code before
  # setting that envar, our .ini file may have no effect).
! # However, we want *some* Spambayes code before the options are processed
! # so this is now 2 steps - get the "early" spambayes core stuff (which
! # must not import spambayes.Options) and sets up sys.path, and "later" core
! # stuff, which can include spambayes.Options, and assume sys.path in place.
! def import_early_core_spambayes_stuff():
      try:
!         from spambayes import OptionsClass
      except ImportError:
          parent = os.path.abspath(os.path.join(os.path.dirname(this_filename),
***************
*** 68,71 ****
--- 68,76 ----
          sys.path.insert(0, parent)
  
+ def import_core_spambayes_stuff(ini_filename):
+     assert "spambayes.Options" not in sys.modules, \
+         "'spambayes.Options' was imported too early"
+     global bayes_classifier, bayes_tokenize, bayes_storage
+     os.environ["BAYESCUSTOMIZE"] = ini_filename
      from spambayes import classifier
      from spambayes.tokenizer import tokenize
***************
*** 74,77 ****
--- 79,84 ----
      bayes_tokenize = tokenize
      bayes_storage = storage
+     assert "spambayes.Options" in sys.modules, \
+         "Expected 'spambayes.Options' to be loaded here"
  
  class ManagerError(Exception):
***************
*** 172,199 ****
      def __init__(self, config_base="default", outlook=None, verbose=1):
          self.reported_startup_error = False
!         self.config = None
          self.addin = None
          self.verbose = verbose
          self.stats = Stats()
!         self.application_directory = os.path.dirname(this_filename)
!         self.data_directory = self.LocateDataDirectory()
!         self.MigrateDataDirectory()
!         if not os.path.isabs(config_base):
!             config_base = os.path.join(self.data_directory,
!                                        config_base)
!         config_base = os.path.abspath(config_base)
  
!         self.ini_filename = config_base + "_bayes_customize.ini"
!         self.config_filename = config_base + "_configuration.pck"
  
!         # Read the configuration file.
!         self.config = self.LoadConfig()
  
!         self.outlook = outlook
  
!         import_core_spambayes_stuff(self.ini_filename)
  
!         bayes_base = config_base + "_bayes_database"
!         mdb_base = config_base + "_message_database"
          # determine which db manager to use, and create it.
          ManagerClass = [PickleStorageManager, DBStorageManager][use_db]
--- 179,232 ----
      def __init__(self, config_base="default", outlook=None, verbose=1):
          self.reported_startup_error = False
!         self.config = self.options = None
          self.addin = None
          self.verbose = verbose
          self.stats = Stats()
!         self.outlook = outlook
  
!         import_early_core_spambayes_stuff()
  
!         self.application_directory = os.path.dirname(this_filename)
!         # where windows would like our data stored (and where
!         # we do, unless overwritten via a config file)
!         self.windows_data_directory = self.LocateDataDirectory()
!         # Read the primary configuration files
!         self.PrepareConfig()
  
!         # See if the initial config files specify a
!         # "data directory".  If so, use it, otherwise
!         # use the default Windows data directory for our app.
!         value = self.config.general.data_directory
!         if value:
!             try:
!                 if not os.path.isdir(value):
!                     os.makedirs(value)
!                 if not os.path.isdir(value):
!                     raise os.error
!                 value = os.path.abspath(value)
!             except os.error:
!                 print "The configuration files have specified a data directory of"
!                 print repr(value)
!                 print "but it is not valid.  Using default"
!                 value = None
!         if value:
!             self.data_directory = value
!         else:
!             self.data_directory = self.windows_data_directory
!             
!         # Now we have the data directory, migrate anything needed, and load
!         # any config from it.
!         self.MigrateDataDirectory()
  
!         # Get the message store before loading config, as we use the profile
!         # name.
!         self.message_store = msgstore.MAPIMsgStore(outlook)
!         self.LoadConfig()
  
!         bayes_options_filename = os.path.join(self.data_directory, "default_bayes_customize.ini")
!         import_core_spambayes_stuff(bayes_options_filename)
! 
!         bayes_base = os.path.join(self.data_directory, "default_bayes_database")
!         mdb_base = os.path.join(self.data_directory, "default_message_database")
          # determine which db manager to use, and create it.
          ManagerClass = [PickleStorageManager, DBStorageManager][use_db]
***************
*** 202,206 ****
          self.bayes = self.message_db = None
          self.LoadBayes()
-         self.message_store = msgstore.MAPIMsgStore(outlook)
  
      def ReportError(self, message, title = None):
--- 235,238 ----
***************
*** 319,323 ****
          if self.verbose > 1:
              print "Checking folder '%s' for our field '%s'" \
!                   % (self.config.field_score_name,folder.Name.encode("mbcs", "replace"))
          items = folder.Items
          item = items.GetFirst()
--- 351,355 ----
          if self.verbose > 1:
              print "Checking folder '%s' for our field '%s'" \
!                   % (self.config.general.field_score_name,folder.Name.encode("mbcs", "replace"))
          items = folder.Items
          item = items.GetFirst()
***************
*** 333,337 ****
              for i in range(ups.Count):
                  up = ups[i+1]
!                 if up.Name == self.config.field_score_name:
                      break
              else: # for not broken
--- 365,369 ----
              for i in range(ups.Count):
                  up = ups[i+1]
!                 if up.Name == self.config.general.field_score_name:
                      break
              else: # for not broken
***************
*** 341,345 ****
                      # 1 is the first - "Rounded", which seems fine.
                      format = 1
!                     ups.Add(self.config.field_score_name,
                             win32com.client.constants.olPercent,
                             True, # Add to folder
--- 373,377 ----
                      # 1 is the first - "Rounded", which seems fine.
                      format = 1
!                     ups.Add(self.config.general.field_score_name,
                             win32com.client.constants.olPercent,
                             True, # Add to folder
***************
*** 366,373 ****
          import time
          start = time.clock()
-         if not os.path.exists(self.ini_filename):
-             raise ManagerError("The file '%s' must exist before the "
-                                "database '%s' can be opened or created" % (
-                                self.ini_filename, self.db_manager.bayes_filename))
          bayes = message_db = None
          try:
--- 398,401 ----
***************
*** 403,435 ****
              print "Loaded databases in %gms" % ((time.clock()-start)*1000)
  
      def LoadConfig(self):
!         # Our 'config' file always uses a pickle
          try:
!             f = open(self.config_filename, 'rb')
          except IOError:
              if self.verbose:
!                 print ("Created new configuration file '%s'" %
!                        self.config_filename)
!             return config.ConfigurationRoot()
! 
          try:
!             ret = cPickle.load(f)
              f.close()
!             if self.verbose > 1:
!                 print "Loaded configuration from '%s':" % self.config_filename
!                 ret._dump()
!         except IOError, details:
!             # File-not-found - less serious.
!             ret = config.ConfigurationRoot()
!             if self.verbose > 1:
!                 # filename included in exception!
!                 print "IOError loading configuration (%s) - using default:" % (details)
!         except:
!             # Any other error loading configuration is nasty, but should not
!             # cause a fatal error.
!             msg = "FAILED to load configuration from '%s'" % (self.config_filename,)
!             self.ReportFatalStartupError(msg)
!             ret = config.ConfigurationRoot()
!         return ret
  
      def InitNewBayes(self):
--- 431,537 ----
              print "Loaded databases in %gms" % ((time.clock()-start)*1000)
  
+     def PrepareConfig(self):
+         # Load our Outlook specific configuration.  This is done before
+         # SpamBayes is imported, and thus we are able to change the INI
+         # file used for the engine.  It is also done before the primary
+         # options are loaded - this means we can change the directory
+         # from which these options are loaded.
+         import config
+         self.options = config.CreateConfig()
+         # Note that self.options really *is* self.config - but self.config
+         # allows a "." notation to access the values.  Changing one is reflected
+         # immediately in the other.
+         self.config = config.OptionsContainer(self.options)
+ 
+         filename = os.path.join(self.application_directory, "default_configuration.ini")
+         self._MergeConfigFile(filename)
+ 
+         filename = os.path.join(self.windows_data_directory, "default_configuration.ini")
+         self._MergeConfigFile(filename)
+ 
+     def _MergeConfigFile(self, filename):
+         try:
+             self.options.merge_file(filename)
+         except:
+             msg = "The configuration file named below is invalid.\r\n" \
+                     "Please either correct or remove this file\r\n\r\n" \
+                     "Filename: " + filename
+             self.ReportError(msg)
+ 
      def LoadConfig(self):
!         profile_name = self.message_store.GetProfileName()
!         if profile_name is None:
!             # should only happen in source-code versions - older win32alls can't
!             # determine this.
!             profile_name = "unknown_profile"
!         else:
!             # xxx - remove me sometime - win32all grew this post 154(ish)
!             # binary never released with this, so we can be a little more brutal
!             # Try and rename to current profile, silent failure
!             try:
!                 os.rename(os.path.join(self.data_directory, "unknown_profile.ini"),
!                           os.path.join(self.data_directory, profile_name + ".ini"))
!             except os.error:
!                 pass
! 
!         self.config_filename = os.path.join(self.data_directory, profile_name + ".ini")
!         # Now load it up
!         self._MergeConfigFile(self.config_filename)
!         self.MigrateOldPickle()
! 
!     def MigrateOldPickle(self):
!         assert self.config is not None, "Must have a config"
!         pickle_filename = os.path.join(self.data_directory,
!                                        "default_configuration.pck")
          try:
!             f = open(pickle_filename, 'rb')
          except IOError:
              if self.verbose:
!                 print "No old pickle file to migrate"
!             return
!         print "Migrating old pickle '%s'" % pickle_filename
          try:
!             try:
!                 old_config = cPickle.load(f)
!             except IOError, details:
!                 print "FAILED to load old pickle"
!                 print details
!                 msg = "There was an error loading your old\r\n" \
!                       "SpamBayes configuration file.\r\n\r\n" \
!                       "It is likely that you will need to re-configure\r\n" \
!                       "SpamBayes before it will function correctly."
!                 self.ReportError(msg)
!                 # But we can't abort yet - we really should still try and
!                 # delete it, as we aren't gunna work next time in this case!
!                 old_config = None
!         finally:
              f.close()
!         if old_config is not None:
!             for section, items in old_config.__dict__.items():
!                 print " migrating section '%s'" % (section,)
!                 # exactly one value wasn't in a section - now in "general"
!                 dict = getattr(items, "__dict__", None)
!                 if dict is None:
!                     dict = {section: items}
!                     section = "general"
!                 for name, value in dict.items():
!                     sect = getattr(self.config, section)
!                     setattr(sect, name, value)
!         # Save the config, then delete the pickle so future attempts to
!         # migrate will fail.  We save first, so failure here means next
!         # attempt should still find the pickle.
!         if self.verbose:
!             print "pickle migration doing initial configuration save"
!         self.SaveConfig()
!         try:
!             if self.verbose:
!                 print "pickle migration removing '%s'" % pickle_filename
!             os.remove(pickle_filename)
!         except os.error:
!             msg = "There was an error migrating and removing your old\r\n" \
!                   "SpamBayes configuration file.  Configuration changes\r\n" \
!                   "you make are unlikely to be reflected next\r\n" \
!                   "time you start Outlook.  Please try rebooting."
!             self.ReportError(msg)
  
      def InitNewBayes(self):
***************
*** 481,490 ****
  
      def SaveConfig(self):
          if self.verbose > 1:
!             print "Saving configuration:"
!             self.config._dump()
!             print " ->", self.config_filename
!         assert self.config, "Have no config to save!"
!         SavePickle(self.config, self.config_filename)
  
      def Save(self):
--- 583,591 ----
  
      def SaveConfig(self):
+         print "Saving configuration ->", self.config_filename
          if self.verbose > 1:
!             self.options.display()
!         assert self.config and self.options, "Have no config to save!"
!         self.options.update_file(self.config_filename)
  
      def Save(self):

Index: msgstore.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/msgstore.py,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** msgstore.py	4 Jun 2003 01:47:13 -0000	1.45
--- msgstore.py	16 Jun 2003 05:00:23 -0000	1.46
***************
*** 136,139 ****
--- 136,162 ----
          mapi.MAPIUninitialize()
  
+     def GetProfileName(self):
+         # Return the name of the MAPI profile currently in use.
+         # XXX - note - early win32all versions are missing
+         # GetStatusTable :(
+         try:
+             self.session.GetStatusTable
+         except AttributeError:
+             # We try and recover from this when win32all is updated, so no need to whinge.
+             return None
+ 
+         MAPI_SUBSYSTEM = 39
+         restriction = mapi.RES_PROPERTY, (mapi.RELOP_EQ, PR_RESOURCE_TYPE,
+                                           (PR_RESOURCE_TYPE, MAPI_SUBSYSTEM))
+         table = self.session.GetStatusTable(0)
+         rows = mapi.HrQueryAllRows(table,
+                                     (PR_DISPLAY_NAME_A,),   # columns to retrieve
+                                     restriction,     # only these rows
+                                     None,            # any sort order is fine
+                                     0)               # any # of results is fine
+         assert len(rows)==1, "Should be exactly one row"
+         (tag, val), = rows[0]
+         return val
+ 
      def _GetMessageStore(self, store_eid): # bin eid.
          try:



From mhammond at users.sourceforge.net  Mon Jun 16 20:04:13 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Mon Jun 16 22:04:16 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000 addin.py, 1.60,
	1.61 config.py, 1.9, 1.10 filter.py, 1.23, 1.24 msgstore.py,
	1.46, 1.47
Message-ID: <E19S5pV-0002UY-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	addin.py config.py filter.py msgstore.py 
Log Message:
2 new [General] options - delete_as_spam_message_state and 
recover_from_spam_message_state.  These specify if the message "Read" flag
should be changed on messages either "deleted from spam" or "recovered from
spam".  If "None", no change is made (as previously).  May also be "Read"
or "Unread", and the state is changed accordingly.


Index: addin.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/addin.py,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** addin.py	16 Jun 2003 05:00:22 -0000	1.60
--- addin.py	17 Jun 2003 02:04:10 -0000	1.61
***************
*** 310,313 ****
--- 310,318 ----
      new_msg.HTMLBody = "<HTML><BODY>" + body + "</BODY></HTML>"
      # Attach the source message to it
+     # Using the original message has the side-effect of marking the original
+     # as unread.  Tried to make a copy, but the copy then refused to delete
+     # itself.
+     # And the "UnRead" property of the message is not reflected in the object
+     # model (we need to "refresh" the message).  Oh well.
      new_msg.Attachments.Add(item, constants.olByValue,
                              DisplayName="Original Message")
***************
*** 360,363 ****
--- 365,369 ----
              return
          import train
+         new_msg_state = self.manager.config.general.delete_as_spam_message_state
          for msgstore_message in msgstore_messages:
              # Must train before moving, else we lose the message!
***************
*** 368,371 ****
--- 374,388 ----
              else:
                  print "already was trained as spam"
+             # Do the new message state if necessary.
+             try:
+                 if new_msg_state == "Read":
+                     msgstore_message.SetReadState(True)
+                 elif new_msg_state == "Unread":
+                     msgstore_message.SetReadState(False)
+                 else:
+                     if new_msg_state not in ["", "None", None]:
+                         print "*** Bad new_msg_state value: %r" % (new_msg_state,)
+             except pythoncom.com_error:
+                 print "*** Failed to set the message state to '%s' for message '%s'" % (new_msg_state, subject)
              # Now move it.
              msgstore_message.MoveTo(spam_folder)
***************
*** 399,402 ****
--- 416,420 ----
          inbox_folder = msgstore.GetFolder(
                      app.Session.GetDefaultFolder(constants.olFolderInbox))
+         new_msg_state = self.manager.config.general.recover_from_spam_message_state
          import train
          for msgstore_message in msgstore_messages:
***************
*** 417,420 ****
--- 435,449 ----
              else:
                  print "already was trained as ham"
+             # Do the new message state if necessary.
+             try:
+                 if new_msg_state == "Read":
+                     msgstore_message.SetReadState(True)
+                 elif new_msg_state == "Unread":
+                     msgstore_message.SetReadState(False)
+                 else:
+                     if new_msg_state not in ["", "None", None]:
+                         print "*** Bad new_msg_state value: %r" % (new_msg_state,)
+             except pythoncom.com_error:
+                 print "*** Failed to set the message state to '%s' for message '%s'" % (new_msg_state, subject)
              # Now move it.
              msgstore_message.MoveTo(restore_folder)

Index: config.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/config.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** config.py	16 Jun 2003 05:00:23 -0000	1.9
--- config.py	17 Jun 2003 02:04:11 -0000	1.10
***************
*** 23,26 ****
--- 23,27 ----
  FIELD_NAME = r"[a-zA-Z0-9 ]+"
  FILTER_ACTION = "Untouched", "Moved", "Copied"
+ MSG_READ_STATE = "None", "Read", "Unread"
  
  from spambayes.OptionsClass import OptionsClass, Option
***************
*** 92,95 ****
--- 93,104 ----
          """""",
          PATH, RESTORE),
+     ("delete_as_spam_message_state", "How the 'read' flag on a message is modified", "None",
+         """When the 'Delete as Spam' function is used, the message 'read' flag can
+            also be set.""",
+            MSG_READ_STATE, RESTORE),
+     ("recover_from_spam_message_state", "How the 'read' flag on a message is modified", "None",
+         """When the 'Recover from Spam' function is used, the message 'read' flag can
+            also be set.""",
+            MSG_READ_STATE, RESTORE),
      ),
      "Training" : (

Index: filter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/filter.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** filter.py	16 Jun 2003 05:00:23 -0000	1.23
--- filter.py	17 Jun 2003 02:04:11 -0000	1.24
***************
*** 91,95 ****
              break
          progress.tick()
!         if only_unread and not message.unread or \
             only_unseen and message.GetField(field_name) is not None:
              continue
--- 91,95 ----
              break
          progress.tick()
!         if only_unread and message.GetReadState() or \
             only_unseen and message.GetField(field_name) is not None:
              continue

Index: msgstore.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/msgstore.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** msgstore.py	16 Jun 2003 05:00:23 -0000	1.46
--- msgstore.py	17 Jun 2003 02:04:11 -0000	1.47
***************
*** 52,56 ****
  class MsgStoreMsg:
      def __init__(self):
!         self.unread = False
      def GetEmailPackageObject(self):
          # Return a "read-only" Python email package object
--- 52,56 ----
  class MsgStoreMsg:
      def __init__(self):
!         pass
      def GetEmailPackageObject(self):
          # Return a "read-only" Python email package object
***************
*** 94,97 ****
--- 94,102 ----
  MYPR_BODY_HTML_W = 0x1013001f # ditto
  
+ CLEAR_READ_FLAG = 0x00000004
+ CLEAR_RN_PENDING = 0x00000020
+ CLEAR_NRN_PENDING = 0x00000040
+ SUPPRESS_RECEIPT = 0x1
+ 
  USE_DEFERRED_ERRORS = mapi.MAPI_DEFERRED_ERRORS # or set to zero to see what changes <wink>
  
***************
*** 470,485 ****
          # Thus, searchkey is the only reliable long-lived message key.
          self.searchkey = searchkey
!         self.flags = flags
!         self.unread = flags & MSGFLAG_READ == 0
          self.dirty = False
  
      def __repr__(self):
!         if self.unread:
!             urs = "read"
!         else:
!             urs = "unread"
!         return "<%s, '%s' (%s) id=%s/%s>" % (self.__class__.__name__,
                                       self.GetSubject(),
-                                      urs,
                                       mapi.HexFromBin(self.id[0]),
                                       mapi.HexFromBin(self.id[1]))
--- 475,484 ----
          # Thus, searchkey is the only reliable long-lived message key.
          self.searchkey = searchkey
!         self.flags = flags #  flags are unreliable - they change!
          self.dirty = False
  
      def __repr__(self):
!         return "<%s, '%s' id=%s/%s>" % (self.__class__.__name__,
                                       self.GetSubject(),
                                       mapi.HexFromBin(self.id[0]),
                                       mapi.HexFromBin(self.id[1]))
***************
*** 772,775 ****
--- 771,793 ----
              return None
          return val
+ 
+     def GetReadState(self):
+         val = self.GetField(PR_MESSAGE_FLAGS)
+         return (val&MSGFLAG_READ) != 0
+ 
+     def SetReadState(self, is_read):
+         self._EnsureObject()
+         # always try and clear any pending delivery reports of read/unread
+         if is_read:
+             self.mapi_object.SetReadFlag(USE_DEFERRED_ERRORS|SUPPRESS_RECEIPT)
+         else:
+             self.mapi_object.SetReadFlag(USE_DEFERRED_ERRORS|CLEAR_READ_FLAG)
+         if __debug__:
+             if self.GetReadState() != is_read:
+                 print "MAPI SetReadState appears to have failed to change the message state"
+                 print "Requested set to %s but the MAPI field after was %r" % \
+                       (is_read, self.GetField(PR_MESSAGE_FLAGS))
+ 
+     # unsent may also be useful - MSGFLAG_UNSENT bit in PR_MESSAGE_FLAGS .
  
      def Save(self):



From mhammond at users.sourceforge.net  Mon Jun 16 20:04:46 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Mon Jun 16 22:04:51 2003
Subject: [Spambayes-checkins] 
	spambayes/Outlook2000/sandbox set_read_flag.py, NONE, 1.1
Message-ID: <E19S5q2-0002Vo-00@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	set_read_flag.py 
Log Message:
New little test script to set the read flag on messages.


--- NEW FILE: set_read_flag.py ---
from __future__ import generators
# Set items to read/unread 

import pythoncom
import os, sys

from win32com.mapi import mapi, mapiutil
from win32com.mapi.mapitags import *

MSGFLAG_READ = 0x1

CLEAR_READ_FLAG = 0x00000004
CLEAR_RN_PENDING = 0x00000020
CLEAR_NRN_PENDING = 0x00000040
SUPPRESS_RECEIPT = 0x1

import mapi_driver

def SetReadState(driver, mapi_folder, subject, unread):
    hr, data = mapi_folder.GetProps( (PR_DISPLAY_NAME_A,), 0)
    name = data[0][1]
    num = 0
    for item in driver.GetItemsWithValue(mapi_folder, PR_SUBJECT_A, subject):
        flags_base = mapi.MAPI_DEFERRED_ERRORS | SUPPRESS_RECEIPT
        if unread:
            item.SetReadFlag(mapi.MAPI_DEFERRED_ERRORS|CLEAR_READ_FLAG)
        else:
            item.SetReadFlag(flags_base)
        num += 1
        # Check the set worked.
        hr, props = item.GetProps((PR_MESSAGE_FLAGS,), 0)
        ((tag, val), ) = props
        if val & MSGFLAG_READ == unread:
            print "MAPI SetReadState appears to have failed to change the message state"
            print "Requested set to unread=%s but the MAPI field after was %r" % \
                    (unread, val)
    print "Processed", num, "items"

def usage(driver):
    folder_doc = driver.GetFolderNameDoc()
    msg = """\
Usage: %s [-u] subject of the message
-f - Search for the message in the specified folder (default = Inbox)
-u - Mark as unread

Marks as read (or unread) all messages that match the subject.  Subject
matching is substring and ignore-case.

%s
Use the -n option to see all top-level folder names from all stores.""" \
    % (os.path.basename(sys.argv[0]),folder_doc)
    print msg

def main():
    driver = mapi_driver.MAPIDriver()

    import getopt
    try:
        opts, args = getopt.getopt(sys.argv[1:], "u")
    except getopt.error, e:
        print e
        print
        usage(driver)
        sys.exit(1)
    folder_name = ""

    unread = False
    for opt, opt_val in opts:
        if opt == "-u":
            unread = True
        else:
            print "Invalid arg"
            return

    if not folder_name:
        folder_name = "Inbox" # Assume this exists!

    subject = " ".join(args)
    if not subject:
        print "You must specify a subject"
        print
        usage(driver)
        sys.exit(1)

    try:
        folder = driver.FindFolder(folder_name)
    except ValueError, details:
        print details
        sys.exit(1)

    SetReadState(driver, folder, subject, unread)

if __name__=='__main__':
    main()



From mhammond at users.sourceforge.net  Mon Jun 16 21:22:04 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Mon Jun 16 23:22:09 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000/dialogs
	FolderSelector.py, 1.17, 1.18
Message-ID: <E19S72q-0004lR-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	FolderSelector.py 
Log Message:
Prevent "Deleted items", Outbox and Sent Items from appearing in the
folder list.  Fixes:
[ 749277 ] Should prevent "Deleted Items" being target folder


Index: FolderSelector.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/FolderSelector.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** FolderSelector.py	15 May 2003 01:00:04 -0000	1.17
--- FolderSelector.py	17 Jun 2003 03:22:02 -0000	1.18
***************
*** 18,25 ****
  # Helpers for building the folder list
  class FolderSpec:
!     def __init__(self, folder_id, name):
          self.folder_id = folder_id
          self.name = name
          self.children = []
  
      def dump(self, level=0):
--- 18,26 ----
  # Helpers for building the folder list
  class FolderSpec:
!     def __init__(self, folder_id, name, ignore_eids = None):
          self.folder_id = folder_id
          self.name = name
          self.children = []
+         self.ignore_eids = ignore_eids
  
      def dump(self, level=0):
***************
*** 53,60 ****
  import pythoncom
  
! def _BuildFoldersMAPI(manager, folder_id):
      # This is called dynamically as folders are expanded.
      win32ui.DoWaitCursor(1)
!     folder = manager.message_store.GetFolder(folder_id).OpenEntry()
      # Get the hierarchy table for it.
      table = folder.GetHierarchyTable(0)
--- 54,61 ----
  import pythoncom
  
! def _BuildFoldersMAPI(manager, folder_spec):
      # This is called dynamically as folders are expanded.
      win32ui.DoWaitCursor(1)
!     folder = manager.message_store.GetFolder(folder_spec.folder_id).OpenEntry()
      # Get the hierarchy table for it.
      table = folder.GetHierarchyTable(0)
***************
*** 68,75 ****
          # re-fetch from the object itself (which is what our manager does,
          # so no need to do it explicitly - just believe folder.id over eid)
          temp_id = mapi.HexFromBin(store_eid), mapi.HexFromBin(eid)
          child_folder = manager.message_store.GetFolder(temp_id)
          if child_folder is not None:
!             spec = FolderSpec(child_folder.GetID(), name)
              # If we have no children at all, indicate
              # the item is not expandable.
--- 69,83 ----
          # re-fetch from the object itself (which is what our manager does,
          # so no need to do it explicitly - just believe folder.id over eid)
+         ignore = False
+         for check_eid in folder_spec.ignore_eids:
+             if manager.message_store.session.CompareEntryIDs(check_eid, eid):
+                 ignore = True
+                 break
+         if ignore:
+             continue
          temp_id = mapi.HexFromBin(store_eid), mapi.HexFromBin(eid)
          child_folder = manager.message_store.GetFolder(temp_id)
          if child_folder is not None:
!             spec = FolderSpec(child_folder.GetID(), name, folder_spec.ignore_eids)
              # If we have no children at all, indicate
              # the item is not expandable.
***************
*** 83,87 ****
      return children
  
! def BuildFolderTreeMAPI(session):
      root = FolderSpec(None, "root")
      tab = session.GetMsgStoresTable(0)
--- 91,95 ----
      return children
  
! def BuildFolderTreeMAPI(session, ignore_ids):
      root = FolderSpec(None, "root")
      tab = session.GetMsgStoresTable(0)
***************
*** 94,100 ****
              msgstore = session.OpenMsgStore(0, eid, None, mapi.MDB_NO_MAIL |
                                                            mapi.MAPI_DEFERRED_ERRORS)
!             hr, data = msgstore.GetProps((PR_IPM_SUBTREE_ENTRYID,), 0)
              subtree_eid = data[0][1]
!             folder = msgstore.OpenEntry(subtree_eid, None, mapi.MAPI_DEFERRED_ERRORS)
          except pythoncom.com_error, details:
              # Some weird error opening a folder tree
--- 102,108 ----
              msgstore = session.OpenMsgStore(0, eid, None, mapi.MDB_NO_MAIL |
                                                            mapi.MAPI_DEFERRED_ERRORS)
!             hr, data = msgstore.GetProps((PR_IPM_SUBTREE_ENTRYID,)+ignore_ids, 0)
              subtree_eid = data[0][1]
!             ignore_eids = [item[1] for item in data[1:] if PROP_TYPE(item[0])==PT_BINARY]
          except pythoncom.com_error, details:
              # Some weird error opening a folder tree
***************
*** 104,108 ****
              continue
          folder_id = hex_eid, mapi.HexFromBin(subtree_eid)
!         spec = FolderSpec(folder_id, name)
          spec.children = None
          root.children.append(spec)
--- 112,116 ----
              continue
          folder_id = hex_eid, mapi.HexFromBin(subtree_eid)
!         spec = FolderSpec(folder_id, name, ignore_eids)
          spec.children = None
          root.children.append(spec)
***************
*** 155,159 ****
                                checkbox_text=None,
                                desc_noun="Select",
!                               desc_noun_suffix="ed"):
          assert not single_select or selected_ids is None or len(selected_ids)<=1
          dialog.Dialog.__init__ (self, self.dt)
--- 163,171 ----
                                checkbox_text=None,
                                desc_noun="Select",
!                               desc_noun_suffix="ed",
!                               exclude_prop_ids=(PR_IPM_WASTEBASKET_ENTRYID,
!                                                 PR_IPM_SENTMAIL_ENTRYID,
!                                                 PR_IPM_OUTBOX_ENTRYID)
!                                     ):
          assert not single_select or selected_ids is None or len(selected_ids)<=1
          dialog.Dialog.__init__ (self, self.dt)
***************
*** 168,171 ****
--- 180,184 ----
          self.checkbox_state = checkbox_state
          self.checkbox_text = checkbox_text or "Include &subfolders"
+         self.exclude_prop_ids = exclude_prop_ids
  
      def CompareIDs(self, id1, id2):
***************
*** 316,320 ****
          win32ui.DoWaitCursor(1)
          self.expand_ids = self._DetermineFoldersToExpand()
!         tree = BuildFolderTreeMAPI(self.manager.message_store.session)
          self._InsertSubFolders(0, tree)
          self.selected_ids = [] # Only use this while creating dialog.
--- 329,333 ----
          win32ui.DoWaitCursor(1)
          self.expand_ids = self._DetermineFoldersToExpand()
!         tree = BuildFolderTreeMAPI(self.manager.message_store.session, self.exclude_prop_ids)
          self._InsertSubFolders(0, tree)
          self.selected_ids = [] # Only use this while creating dialog.
***************
*** 387,391 ****
          folderSpec = self.item_map[info[7]]
          if folderSpec.children is None:
!             folderSpec.children = _BuildFoldersMAPI(self.manager, folderSpec.folder_id)
              self._InsertSubFolders(itemHandle, folderSpec)
          return 0
--- 400,404 ----
          folderSpec = self.item_map[info[7]]
          if folderSpec.children is None:
!             folderSpec.children = _BuildFoldersMAPI(self.manager, folderSpec)
              self._InsertSubFolders(itemHandle, folderSpec)
          return 0



From mhammond at users.sourceforge.net  Mon Jun 16 22:07:45 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Tue Jun 17 00:07:47 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000 manager.py,1.60,1.61
Message-ID: <E19S7l3-0006ce-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	manager.py 
Log Message:
Catch the assertion error in the classifier, and warn the user their
database is corrupt.  Not great, but better than nothing and 1 million
more emails to the mailing list.

Also introduces ReportErrorOnce, useful for errors on event handlers
that you don't want to bombard the user with.


Index: manager.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/manager.py,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** manager.py	16 Jun 2003 05:00:23 -0000	1.60
--- manager.py	17 Jun 2003 04:07:43 -0000	1.61
***************
*** 6,9 ****
--- 6,10 ----
  import errno
  import shutil
+ import traceback
  import win32api, win32con, win32ui
  
***************
*** 178,181 ****
--- 179,183 ----
  class BayesManager:
      def __init__(self, config_base="default", outlook=None, verbose=1):
+         self.reported_error_map = {}
          self.reported_startup_error = False
          self.config = self.options = None
***************
*** 259,266 ****
              # We have reported the error, but for the sake of the log, we
              # still want it logged there.
-             import traceback
              print "ERROR:", message
              traceback.print_exc()
  
      # Outlook used to give us thread grief - now we avoid Outlook
      # from threads, but this remains a worthwhile abstraction.
--- 261,278 ----
              # We have reported the error, but for the sake of the log, we
              # still want it logged there.
              print "ERROR:", message
              traceback.print_exc()
  
+     def ReportErrorOnce(self, msg, title = None, key = None):
+         if key is None: key = msg
+         # Always print the message and traceback.
+         print "ERROR:", msg
+         traceback.print_exc()
+         if key in self.reported_error_map:
+             print "(this error has already been reported - not displaying it again)"
+         else:
+             self.reported_error_map[key] = True
+             ReportError(msg, title)
+ 
      # Outlook used to give us thread grief - now we avoid Outlook
      # from threads, but this remains a worthwhile abstraction.
***************
*** 620,624 ****
          """
          email = msg.GetEmailPackageObject()
!         return self.bayes.spamprob(bayes_tokenize(email), evidence)
  
      def ShowManager(self):
--- 632,645 ----
          """
          email = msg.GetEmailPackageObject()
!         try:
!             return self.bayes.spamprob(bayes_tokenize(email), evidence)
!         except AssertionError:
!             # See bug 706520 assert fails in classifier
!             # For now, just tell the user.
!             msg = "It appears your SpamBayes training database is corrupt.\r\n\r\n" \
!                   "We are working on solving this, but unfortunately you\r\n" \
!                   "must re-train the system via the SpamBayes manager."
!             self.ReportErrorOnce(msg)
!             raise
  
      def ShowManager(self):



From mhammond at users.sourceforge.net  Mon Jun 16 22:16:41 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Tue Jun 17 00:16:46 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000/dialogs
	FolderSelector.py, 1.18, 1.19
Message-ID: <E19S7th-0006qY-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	FolderSelector.py 
Log Message:
An error on a single sub-folder need not be fatal.  Hopefully fixes
[ 743515 ] Unable to expand folders in folder selection dialog.


Index: FolderSelector.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/FolderSelector.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** FolderSelector.py	17 Jun 2003 03:22:02 -0000	1.18
--- FolderSelector.py	17 Jun 2003 04:16:39 -0000	1.19
***************
*** 77,91 ****
              continue
          temp_id = mapi.HexFromBin(store_eid), mapi.HexFromBin(eid)
!         child_folder = manager.message_store.GetFolder(temp_id)
!         if child_folder is not None:
!             spec = FolderSpec(child_folder.GetID(), name, folder_spec.ignore_eids)
!             # If we have no children at all, indicate
!             # the item is not expandable.
!             table = child_folder.OpenEntry().GetHierarchyTable(0)
!             if table.GetRowCount(0) == 0:
!                 spec.children = []
!             else:
!                 spec.children = None # Flag as "not yet built"
!             children.append(spec)
      win32ui.DoWaitCursor(0)
      return children
--- 77,97 ----
              continue
          temp_id = mapi.HexFromBin(store_eid), mapi.HexFromBin(eid)
!         try:
!             child_folder = manager.message_store.GetFolder(temp_id)
!             if child_folder is not None:
!                 spec = FolderSpec(child_folder.GetID(), name, folder_spec.ignore_eids)
!                 # If we have no children at all, indicate
!                 # the item is not expandable.
!                 table = child_folder.OpenEntry().GetHierarchyTable(0)
!                 if table.GetRowCount(0) == 0:
!                     spec.children = []
!                 else:
!                     spec.children = None # Flag as "not yet built"
!                 children.append(spec)
!         except pythoncom.com_error, details
!             # Users have reported failure here - it is not clear if the
!             # entire tree is going to fail, or just this folder
!             print "** Unable to open child folder - ignoring"
!             print details
      win32ui.DoWaitCursor(0)
      return children



From mhammond at users.sourceforge.net  Mon Jun 16 22:23:31 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Tue Jun 17 00:24:41 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000 addin.py,1.61,1.62
Message-ID: <E19S80J-00074Q-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	addin.py 
Log Message:
DeleteAsSpam didn't detect "no folder" correctly.


Index: addin.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/addin.py,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** addin.py	17 Jun 2003 02:04:10 -0000	1.61
--- addin.py	17 Jun 2003 04:23:29 -0000	1.62
***************
*** 358,363 ****
          win32ui.DoWaitCursor(1)
          # Delete this item as spam.
          spam_folder_id = self.manager.config.filter.spam_folder_id
!         spam_folder = msgstore.GetFolder(spam_folder_id)
          if not spam_folder:
              self.manager.ReportError("You must configure the Spam folder",
--- 358,365 ----
          win32ui.DoWaitCursor(1)
          # Delete this item as spam.
+         spam_folder = None
          spam_folder_id = self.manager.config.filter.spam_folder_id
!         if spam_folder_id:
!             spam_folder = msgstore.GetFolder(spam_folder_id)
          if not spam_folder:
              self.manager.ReportError("You must configure the Spam folder",



From anthonybaxter at users.sourceforge.net  Tue Jun 17 01:36:52 2003
From: anthonybaxter at users.sourceforge.net (Anthony Baxter)
Date: Tue Jun 17 03:36:56 2003
Subject: [Spambayes-checkins] spambayes/spambayes ImapUI.py,1.13,1.14
Message-ID: <E19SB1Q-00046M-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	ImapUI.py 
Log Message:
fix parm_map code

Index: ImapUI.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/ImapUI.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ImapUI.py	26 May 2003 00:00:52 -0000	1.13
--- ImapUI.py	17 Jun 2003 07:36:49 -0000	1.14
***************
*** 85,89 ****
      """Serves the HTML user interface for the proxies."""
      def __init__(self, cls, imap, pwd):
!         global classifier
          # Only offer SSL if it is available
          try:
--- 85,89 ----
      """Serves the HTML user interface for the proxies."""
      def __init__(self, cls, imap, pwd):
!         global classifier, parm_map
          # Only offer SSL if it is available
          try:



From montanaro at users.sourceforge.net  Tue Jun 17 07:47:56 2003
From: montanaro at users.sourceforge.net (Skip Montanaro)
Date: Tue Jun 17 09:47:58 2003
Subject: [Spambayes-checkins] website windows.ht,1.16,1.17
Message-ID: <E19SGoW-0001IE-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	windows.ht 
Log Message:
add instructions about installing the Outlook plugin from source.


Index: windows.ht
===================================================================
RCS file: /cvsroot/spambayes/website/windows.ht,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** windows.ht	26 May 2003 02:08:11 -0000	1.16
--- windows.ht	17 Jun 2003 13:47:53 -0000	1.17
***************
*** 67,71 ****
    registered: can't find encoding".  At the moment, the only workaround is
    to install Python, download the Spambayes distribution and install the
!   plugin from source.</li>
  
    <li><a name="2">Outlook XP SP2</a> is known to work.  Earlier versions are
--- 67,71 ----
    registered: can't find encoding".  At the moment, the only workaround is
    to install Python, download the Spambayes distribution and install the
!   plugin from source (see below).</li>
  
    <li><a name="2">Outlook XP SP2</a> is known to work.  Earlier versions are
***************
*** 85,88 ****
--- 85,119 ----
  </ol>
  </p>
+ 
+ <h3>Installing the Outlook Client From Source</h3>
+ 
+ <p>If the Outlook binary doesn't work for you, you can install from source.
+ To do this, you will need three pieces of software:
+ 
+ <ol>
+   <li> The Python installer, available from the <a
+   href="http://www.python.org/download/">download page</a> of the Python
+   website.  You should choose the latest stable release (that is, the
+   latest release with no letters in its version).</li>
+ 
+   <li> Mark Hammond's <a
+   href="http://starship.python.net/crew/mhammond/win32/Downloads.html">win32all
+   extensions</a>.  Choose the version which corresponds to the version of
+   Python you downloaded.</li>
+ 
+   <li> The Spambayes source, either as a <a
+   href="https://sourceforge.net/project/showfiles.php?group_id=61702">zip
+   file</a> or <a href="http://sourceforge.net/cvs/?group_id=61702">via
+   CVS</a>.  The zip file will probably be easier to handle, but there are
+   several significant improvements to the code which make the CVS version a
+   viable option (though you will have to have a CVS client for Windows
+   installed).</li>
+ </ol>
+ </p>
+ 
+ <p>Once you have all three bits downloaded, run the Python installer then
+ the win32all installer.  Finally, double-click the addin.py script in the
+ Outlook2000 folder of the Spambayes distribution and you should be good to
+ go.</p>
  
  <h2>Other Mail Clients</h2>



From montanaro at users.sourceforge.net  Tue Jun 17 15:37:44 2003
From: montanaro at users.sourceforge.net (Skip Montanaro)
Date: Tue Jun 17 17:37:47 2003
Subject: [Spambayes-checkins] website faq.txt,1.3,1.4
Message-ID: <E19SO9A-0006hs-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	faq.txt 
Log Message:
add a question and answer about things to check when the classifier isn't.



Index: faq.txt
===================================================================
RCS file: /cvsroot/spambayes/website/faq.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** faq.txt	5 Jun 2003 14:19:01 -0000	1.3
--- faq.txt	17 Jun 2003 21:37:40 -0000	1.4
***************
*** 480,483 ****
--- 480,509 ----
  
  
+ Spambayes doesn't seem to catch much spam.  What gives?
+ -------------------------------------------------------
+ 
+ Initially, Spambayes will not be able to distinguish spams from hams.  With
+ no training inputs, the classifier will simply mark everything unsure.  Once
+ you start training the classifier on a representative set of spams and hams
+ it should very quickly begin to improve, however.  If that's not the case,
+ perhaps you have something misconfigured.  Here are a couple things to
+ check:
+ 
+ 1. What do you have your ham and spam thresholds set to?  The defaults are
+    0.2 and 0.9, respectively, and should be reasonable starting points.
+    They should not be close together (say, 0.4 and 0.6).
+ 
+ 2. Have you trained on a reasonable number of hams and spams?  You should
+    train on 10 to 20 of each to start with just to get a decent base.  After
+    that, you should be able to train on just mistakes and messages
+    classified as unsure.
+ 
+ 3. Check to be sure you haven't made any classification mistakes (trained
+    spams as hams or vice versa).  If so, you could really confuse things and
+    should move incorrectly classified messages to their correct locations
+    and retrain (which may happen automatically, depending on how you're
+    using Spambayes).
+ 
+ 
  How do I start from scratch after messing up my training?
  ---------------------------------------------------------



From montanaro at users.sourceforge.net  Tue Jun 17 16:01:39 2003
From: montanaro at users.sourceforge.net (Skip Montanaro)
Date: Tue Jun 17 18:01:41 2003
Subject: [Spambayes-checkins] website Makefile,1.3,1.4
Message-ID: <E19SOWJ-0007hU-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	Makefile 
Log Message:
define EXTRA_TARGETS before the include so make decides that EXTRA_TARGETS
are part of TARGETS when deciding what files 'all' depends on



Index: Makefile
===================================================================
RCS file: /cvsroot/spambayes/website/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile	31 May 2003 01:35:43 -0000	1.3
--- Makefile	17 Jun 2003 22:01:37 -0000	1.4
***************
*** 1,7 ****
  include scripts/make.rules
  ROOT_DIR = .
  ROOT_OFFSET = .	
- 
- EXTRA_TARGETS = reply.txt faq.html default.css
  
  $(TARGETS): links.h
--- 1,8 ----
+ # this def'n must occur before the include!
+ EXTRA_TARGETS = reply.txt faq.html default.css
+ 
  include scripts/make.rules
  ROOT_DIR = .
  ROOT_OFFSET = .	
  
  $(TARGETS): links.h



From mhammond at users.sourceforge.net  Tue Jun 17 19:56:20 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Tue Jun 17 21:56:23 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000 about.html,1.11,1.12
Message-ID: <E19SSBQ-0007IC-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	about.html 
Log Message:
Reference the new configuration guide.


Index: about.html
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/about.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** about.html	4 Jun 2003 02:59:03 -0000	1.11
--- about.html	18 Jun 2003 01:56:18 -0000	1.12
***************
*** 39,42 ****
--- 39,44 ----
  software.</a></li>
  </ul>
+ If you would like to see some additional options you can set, please
+ see the <a href="docs/configuration.html">configuration guide</a>.&nbsp;
  If you have any problems, please see the <a
   href="docs/troubleshooting.html">troubleshooting guide</a>.<br>
***************
*** 159,163 ****
    </tbody>
  </table>
! <br>
  <h2><a name="Field"></a>Viewing and Using the Spam Score Field</h2>
  A custom property named <span style="font-style: italic;">Spam</span>
--- 161,167 ----
    </tbody>
  </table>
! There are some additional options that can be set outside of the user
! interface - please see the <a href="docs/configuration.html">configuration
! guide</a> for more details.<br>
  <h2><a name="Field"></a>Viewing and Using the Spam Score Field</h2>
  A custom property named <span style="font-style: italic;">Spam</span>



From mhammond at users.sourceforge.net  Tue Jun 17 19:56:53 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Tue Jun 17 21:56:57 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000/docs configuration.html,
	NONE, 1.1
Message-ID: <E19SSBx-0007Jh-00@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	configuration.html 
Log Message:
Document some additional options and how config files are used.


--- NEW FILE: configuration.html ---
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
  <meta http-equiv="content-type"
 content="text/html; charset=ISO-8859-1">
  <title>SpamBayes Configuration</title>
</head>
<body style="background-image: url(about:blank);">
<h1>SpamBayes Configuration</h1>
<br>
Many SpamBayes configuration options are managed via the SpamBayes
manager, available from the SpamBayes toolbar item.&nbsp; While this
dialog allows you to configure standard options, there are a number of
other options that can be set manually.<br>
<br>
<span style="font-weight: bold;">WARNING</span>: Please read the
following before going any further.<br>
<ul>
  <li>To change these options, you will need to use a text editor to
edit the main SpamBayes configuration file.&nbsp; If something goes
wrong here, you may lose your existing SpamBayes configuration.&nbsp;
Taking a copy of any files you edit is recommended.</li>
  <li>SpamBayes stores all configuration options, including the list of
folders, in this file.&nbsp; Do NOT change anything you don't
understand.&nbsp; Some of these lines are extremely long - please
ensure they remain as a single line.<br>
  </li>
  <li>Before manually changing any configuration files, please ensure
you have shut down Outlook - otherwise the configuration changes you
have made will be lost if SpamBayes itself automatically saves its
configuration.</li>
</ul>
If you have any further questions, please post them to the SpamBayes
mailing list.<br>
<h2>About SpamBayes configuration files</h2>
SpamBayes configuration options are stored in the directory <span
 style="font-style: italic;">\Documents and
Settings\{username}\Application
Data\SpamBayes\{outlook-profile-name}.ini</span>.&nbsp; Note that the
name of the file depends on the name of your current Outlook profile;
if you use Outlook in Internet Only mode, then the profile is generally
named <span style="font-style: italic;">Microsoft Outlook Internet
Settings</span>.&nbsp; This file is a standard text file, and can be
edited with any text editor.<br>
<br>
A configuration file has a number of sections, and each section
contains a number of named values.&nbsp; For example, you will find the
following excerpt in your INI file:<br>
<pre>[Filter]</pre>
<pre>enabled:True</pre>
This defines a section named <span style="font-style: italic;">Filter</span>,
with value <span style="font-style: italic;">enabled </span>set to
value <span style="font-style: italic;">True</span>.&nbsp; The valid
section names, value names and valid values depends on the
option.&nbsp; Note that in some cases, we will refer to options being
in a certain section, but when you check your INI file, you will find
no such section defined.&nbsp; In this case, simply add the section
header, and any values manually.&nbsp; For example, it will not be
uncommon for you to add a line<br>
<pre>[General]</pre>
if you need to set options in this section, as by default, you INI file
will have no such section.<br>
<h2>Additional Options</h2>
The following options are supported in this version<br>
<table cellpadding="2" cellspacing="2" border="1"
 style="text-align: left; width: 100%;">
  <tbody>
    <tr>
      <td style="vertical-align: top; font-weight: bold;">Section<br>
      </td>
      <td style="vertical-align: top; font-weight: bold;">Option Name<br>
      </td>
      <td style="vertical-align: top; font-weight: bold;">Valid Values<br>
      </td>
      <td style="vertical-align: top; font-weight: bold;">Default<br>
      </td>
      <td style="vertical-align: top; font-weight: bold;">Comments<br>
      </td>
    </tr>
    <tr>
      <td style="vertical-align: top;">[Filter]<br>
      </td>
      <td style="vertical-align: top;">spam_mark_as_read<br>
      </td>
      <td style="vertical-align: top;">True, False<br>
      </td>
      <td style="vertical-align: top;">True<br>
      </td>
      <td style="vertical-align: top;">Determines if spam messages are
marked as 'Read' as they are filtered.&nbsp; This can be set to 'True'
if the new-mail icon bothers you when the only new items are
spam.&nbsp; It can be set to 'False' if you use the 'read' state of
these messages to determine which items you are yet to review.<br>
      </td>
    </tr>
    <tr>
      <td style="vertical-align: top;">[Filter]<br>
      </td>
      <td style="vertical-align: top;">unsure_mark_as_read<br>
      </td>
      <td style="vertical-align: top;">True, False<br>
      </td>
      <td style="vertical-align: top;">False<br>
      </td>
      <td style="vertical-align: top;">Determines if unsure messages
are marked as 'Read' as they are filtered.&nbsp;
See 'spam_mark_as_read' for more details.</td>
    </tr>
    <tr>
      <td style="vertical-align: top;">[General]<br>
      </td>
      <td style="vertical-align: top;">field_score_name<br>
      </td>
      <td style="vertical-align: top;"><br>
      </td>
      <td style="vertical-align: top;">Spam<br>
      </td>
      <td style="vertical-align: top;">The name of the field used by
SpamBayes to record spam scores.&nbsp; This should only be changed if
you know what you are doing.<br>
      </td>
    </tr>
    <tr>
      <td style="vertical-align: top;">[General]<br>
      </td>
      <td style="vertical-align: top;">delete_as_spam_message_state<br>
      </td>
      <td style="vertical-align: top;">None, Read, Unread<br>
      </td>
      <td style="vertical-align: top;">None<br>
      </td>
      <td style="vertical-align: top;">Determines how to set the "Read"
state of a message as they are manually managed by the "Delete as Spam"
button.&nbsp; By default, the 'Read' state of the message is not
changed, but this allows you to explicitly change it to either 'read'
or 'unread'.<br>
      </td>
    </tr>
    <tr>
      <td style="vertical-align: top;">[General]<br>
      </td>
      <td style="vertical-align: top;">recover_from_spam_message_state<br>
      </td>
      <td style="vertical-align: top;">None, Read, Unread<br>
      </td>
      <td style="vertical-align: top;">None<br>
      </td>
      <td style="vertical-align: top;">Determines how to set the "Read"
state of a message as they are
manually managed by the "Recover from Spam" button.&nbsp; By default,
the
'Read' state of the message is not changed, but this allows you to
explicitly change it to either 'read' or 'unread'.</td>
    </tr>
    <tr>
      <td style="vertical-align: top;">[General]<br>
      </td>
      <td style="vertical-align: top;">data_directory<br>
      </td>
      <td style="vertical-align: top;"><br>
      </td>
      <td style="vertical-align: top;"><br>
      </td>
      <td style="vertical-align: top;">The directory where SpamBayes
will save its database and primary configuration file.&nbsp; This can
only be set in the 'early' configuration files - see below.<br>
      </td>
    </tr>
  </tbody>
</table>
<br>
<h2>Multiple Configuration Files</h2>
There is rudimentary support for multiple configuration files.&nbsp;
The intention of these files is to site administrators can set global
options for all SpamBayes users.&nbsp; Only some options make sense to
store in other configuration files.<br>
<br>
All options from all configuration files are "merged".&nbsp; This means
that any file can set any option, and as all options files are
processed, all values are merged.&nbsp; If multiple configuration files
specify the same option, the value from the file last merged is
used.&nbsp; When SpamBayes writes its configuration during normal
processing, the entire merged set of options is written.&nbsp; The end
result of this means that next time SpamBayes is run, the earlier
configuration files will have no effect, as the last one loaded (the
main config file written by SpamBayes) will have all values already.<br>
<br>
SpamBayes processes configuration files in the following order:<br>
<ul>
  <li><span style="font-style: italic;">default_configuration.ini</span>
in the SpamBayes application directory (ie, the directory where the
application lives).&nbsp; By default, no such configuration file will
exist.</li>
  <li><span style="font-style: italic;">default_configuration.ini</span>
in the directory <span style="font-style: italic;">\Documents and
Settings\{username}\Application Data\SpamBayes.</span>&nbsp; By
default, no such configuration file will exist.</li>
  <li>SpamBayes then checks to see if a <span
 style="font-style: italic;">data_directory</span> has been specified
in a <span style="font-style: italic;">[General]</span> section.&nbsp;
If so, this is used as the SpamBayes data directory - otherwise, the <span
 style="font-style: italic;">\Documents and
Settings\{username}\Application Data\SpamBayes</span> directory is used.</li>
  <li><span style="font-style: italic;">{outlook-profile-name}.ini</span>
in the data directory.&nbsp; Using the name of the Outlook profile
means that SpamBayes will work in a multi-profile environment.</li>
  <li>The mail SpamBayes databases are then loaded from the nominated
data directory.</li>
</ul>
<span style="font-style: italic;"></span>
</body>
</html>



From mhammond at users.sourceforge.net  Tue Jun 17 19:59:04 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Tue Jun 17 21:59:07 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000 config.py, 1.10,
	1.11 filter.py, 1.24, 1.25
Message-ID: <E19SSE4-0007PG-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	config.py filter.py 
Log Message:
Allow either spam or unsure messages to be marked as read as they
are filtered.


Index: config.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/config.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** config.py	17 Jun 2003 02:04:11 -0000	1.10
--- config.py	18 Jun 2003 01:59:02 -0000	1.11
***************
*** 158,161 ****
--- 158,168 ----
          """""",
          FILTER_ACTION, RESTORE),
+     ("spam_mark_as_read", "Should filtered spam also be marked as 'read'", True,
+         """Determines if spam messages are marked as 'Read' as they are
+         filtered.  This can be set to 'True' if the new-mail icon bothers
+         you when the only new items are spam.  It can be set to 'False'
+         if you use the 'read' state of these messages to determine which
+         items you are yet to review.""",
+         BOOLEAN, RESTORE),
      (FolderIDOption,
          "unsure_folder_id", "The folder used to track uncertain messages", None,
***************
*** 168,171 ****
--- 175,182 ----
          """""",
          FILTER_ACTION, RESTORE),
+     ("unsure_mark_as_read", "Should filtered uncertain message also be marked as 'read'", False,
+         """Determines if unsure messages are marked as 'Read' as they are
+         filtered.  See 'spam_mark_as_read' for more details.""",
+         BOOLEAN, RESTORE),
      ("enabled", "Is filtering enabled?", False,
          """""",

Index: filter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/filter.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** filter.py	17 Jun 2003 02:04:11 -0000	1.24
--- filter.py	18 Jun 2003 01:59:02 -0000	1.25
***************
*** 54,57 ****
--- 54,60 ----
              folder_id = getattr(config, attr_prefix + "_folder_id")
              action = getattr(config, attr_prefix + "_action").lower()
+             mark_as_read = getattr(config, attr_prefix + "_mark_as_read")
+             if mark_as_read:
+                 msg.SetReadState(True)
              if action.startswith("un"): # untouched
                  pass



From mhammond at users.sourceforge.net  Tue Jun 17 20:29:51 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Tue Jun 17 22:29:55 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000/docs configuration.html,
	1.1, 1.2
Message-ID: <E19SShr-0008Hp-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	configuration.html 
Log Message:
Tony is correct - we should default to False, even just to convince
new users that Spam should be reviewed.


Index: configuration.html
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/docs/configuration.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** configuration.html	18 Jun 2003 01:56:51 -0000	1.1
--- configuration.html	18 Jun 2003 02:29:49 -0000	1.2
***************
*** 85,90 ****
        <td style="vertical-align: top;">True, False<br>
        </td>
!       <td style="vertical-align: top;">True<br>
!       </td>
        <td style="vertical-align: top;">Determines if spam messages are
  marked as 'Read' as they are filtered.&nbsp; This can be set to 'True'
--- 85,89 ----
        <td style="vertical-align: top;">True, False<br>
        </td>
!       <td style="vertical-align: top;">False</td>
        <td style="vertical-align: top;">Determines if spam messages are
  marked as 'Read' as they are filtered.&nbsp; This can be set to 'True'



From mhammond at users.sourceforge.net  Tue Jun 17 20:29:51 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Tue Jun 17 22:29:56 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000 config.py,1.11,1.12
Message-ID: <E19SShr-0008Hl-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	config.py 
Log Message:
Tony is correct - we should default to False, even just to convince
new users that Spam should be reviewed.


Index: config.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/config.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** config.py	18 Jun 2003 01:59:02 -0000	1.11
--- config.py	18 Jun 2003 02:29:49 -0000	1.12
***************
*** 158,162 ****
          """""",
          FILTER_ACTION, RESTORE),
!     ("spam_mark_as_read", "Should filtered spam also be marked as 'read'", True,
          """Determines if spam messages are marked as 'Read' as they are
          filtered.  This can be set to 'True' if the new-mail icon bothers
--- 158,162 ----
          """""",
          FILTER_ACTION, RESTORE),
!     ("spam_mark_as_read", "Should filtered spam also be marked as 'read'", False,
          """Determines if spam messages are marked as 'Read' as they are
          filtered.  This can be set to 'True' if the new-mail icon bothers



From mhammond at users.sourceforge.net  Tue Jun 17 22:47:35 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Wed Jun 18 00:47:38 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000 addin.py,1.62,1.63
Message-ID: <E19SUr9-0005rX-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	addin.py 
Log Message:
More work on the toolbar.  OnActivate *does* crash Outlook 2000, just like
the comment say - except only as a new window is created.

Button events are only hooked once - this prevents multiple events being
dispatched when multiple windows are open.

Only create a SpamBayes toolbar once.  If the toolbar was created for
one explorer Window, newly created Windows don't see the new toolbar (but
they do once outlook is restarted).  Creating a second toolbar in this case
would cause Outlook to start with 2 SpamBayes toolbars.  This is bad.  The
end result is that if multiple windows are created the first time SpamBayes
is run, only one window gets the toolbar.  Subsequent runs of Outlook
then work correctly.


Index: addin.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/addin.py,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** addin.py	17 Jun 2003 04:23:29 -0000	1.62
--- addin.py	18 Jun 2003 04:47:33 -0000	1.63
***************
*** 479,492 ****
  # All UI elements are managed here, and there is one instance per explorer.
  class ExplorerWithEvents:
!     def Init(self, manager, explorer_list):
          self.manager = manager
          self.have_setup_ui = False
!         self.explorer_list = explorer_list
          self.toolbar = None
-         self.buttons = []
  
      def SetupUI(self):
          manager = self.manager
-         self.buttons = []
          activeExplorer = self
          assert self.toolbar is None, "Should not yet have a toolbar"
--- 479,490 ----
  # All UI elements are managed here, and there is one instance per explorer.
  class ExplorerWithEvents:
!     def Init(self, manager, explorers_collection):
          self.manager = manager
          self.have_setup_ui = False
!         self.explorers_collection = explorers_collection
          self.toolbar = None
  
      def SetupUI(self):
          manager = self.manager
          activeExplorer = self
          assert self.toolbar is None, "Should not yet have a toolbar"
***************
*** 515,540 ****
                          Enabled = True,
                          Tag = "SpamBayesCommand.Popup")
!         # Convert from "CommandBarItem" to derived
!         # "CommandBarPopup" Not sure if we should be able to work
!         # this out ourselves, but no introspection I tried seemed
!         # to indicate we can.  VB does it via strongly-typed
!         # declarations.
!         popup = CastTo(popup, "CommandBarPopup")
!         # And add our children.
!         self._AddControl(popup,
!                        constants.msoControlButton,
!                        ButtonEvent, (manager.ShowManager,),
!                        Caption="Anti-Spam Manager...",
!                        TooltipText = "Show the Anti-Spam manager dialog.",
!                        Enabled = True,
!                        Visible=True,
!                        Tag = "SpamBayesCommand.Manager")
!         self._AddControl(popup,
!                        constants.msoControlButton,
!                        ButtonEvent, (ShowClues, self.manager, self),
!                        Caption="Show spam clues for current message",
!                        Enabled=True,
!                        Visible=True,
!                        Tag = "SpamBayesCommand.Clues")
          # If we are running from Python sources, enable a few extra items
          if not hasattr(sys, "frozen"):
--- 513,539 ----
                          Enabled = True,
                          Tag = "SpamBayesCommand.Popup")
!         if popup is not None: # We may not be able to find/create our button
!             # Convert from "CommandBarItem" to derived
!             # "CommandBarPopup" Not sure if we should be able to work
!             # this out ourselves, but no introspection I tried seemed
!             # to indicate we can.  VB does it via strongly-typed
!             # declarations.
!             popup = CastTo(popup, "CommandBarPopup")
!             # And add our children.
!             self._AddControl(popup,
!                            constants.msoControlButton,
!                            ButtonEvent, (manager.ShowManager,),
!                            Caption="Anti-Spam Manager...",
!                            TooltipText = "Show the Anti-Spam manager dialog.",
!                            Enabled = True,
!                            Visible=True,
!                            Tag = "SpamBayesCommand.Manager")
!             self._AddControl(popup,
!                            constants.msoControlButton,
!                            ButtonEvent, (ShowClues, self.manager, self),
!                            Caption="Show spam clues for current message",
!                            Enabled=True,
!                            Visible=True,
!                            Tag = "SpamBayesCommand.Clues")
          # If we are running from Python sources, enable a few extra items
          if not hasattr(sys, "frozen"):
***************
*** 566,572 ****
          # that.
          assert item_attrs.has_key('Tag'), "Need a 'Tag' attribute!"
          item = self.CommandBars.FindControl(
                          Type = control_type,
!                         Tag = item_attrs['Tag'])
          if item is None:
              if parent is None:
--- 565,572 ----
          # that.
          assert item_attrs.has_key('Tag'), "Need a 'Tag' attribute!"
+         tag = item_attrs["Tag"]
          item = self.CommandBars.FindControl(
                          Type = control_type,
!                         Tag = tag)
          if item is None:
              if parent is None:
***************
*** 588,608 ****
                          # for not broken - can't find toolbar.  Create a new one.
                          # Create it as a permanent one (which is default)
                          print "Creating new SpamBayes toolbar to host our buttons"
                          self.toolbar = bars.Add(toolbar_name, constants.msoBarTop, Temporary=False)
                      self.toolbar.Visible = True
                  parent = self.toolbar
              # Now add the item itself to the parent.
              item = parent.Controls.Add(Type=control_type, Temporary=False)
!         # Hook events for the item
!         if events_class is not None:
              item = DispatchWithEvents(item, events_class)
              item.Init(*events_init_args)
          # Set the extra attributes passed in.
          for attr, val in item_attrs.items():
              setattr(item, attr, val)
-         # remember and return the item.
-         # (not remembering causes events to get disconnected as our objects
-         # destruct)
-         self.buttons.append(item)
          return item
  
--- 588,618 ----
                          # for not broken - can't find toolbar.  Create a new one.
                          # Create it as a permanent one (which is default)
+                         if self.explorers_collection.have_created_toolbar:
+                             # Eeek - we have already created a toolbar, but
+                             # now we can't find it.  It is likely this is the
+                             # first time we are being run, and outlook is
+                             # being started with multiple Windows open.
+                             # Hopefully things will get back to normal once
+                             # Outlook is restarted (which testing shows it does)
+                             return
+ 
                          print "Creating new SpamBayes toolbar to host our buttons"
                          self.toolbar = bars.Add(toolbar_name, constants.msoBarTop, Temporary=False)
+                         self.explorers_collection.have_created_toolbar = True
                      self.toolbar.Visible = True
                  parent = self.toolbar
              # Now add the item itself to the parent.
              item = parent.Controls.Add(Type=control_type, Temporary=False)
!         # Hook events for the item, but only if we haven't already in some
!         # other explorer instance.
!         if events_class is not None and tag not in self.explorers_collection.button_event_map:
              item = DispatchWithEvents(item, events_class)
              item.Init(*events_init_args)
+             # We must remember the item itself, else the events get disconnected
+             # as the item destructs.
+             self.explorers_collection.button_event_map[tag] = item
          # Set the extra attributes passed in.
          for attr, val in item_attrs.items():
              setattr(item, attr, val)
          return item
  
***************
*** 631,643 ****
      # The Outlook event handlers
      def OnActivate(self):
          # See comments for OnNewExplorer below.
          # *sigh* - OnActivate seems too early too for Outlook 2000,
          # but Outlook 2003 seems to work here, and *not* the folder switch etc
!         # This also appears to solve some issues relating to multi-profiles
!         # on 2000 (where secondary profiles appears to behave closer to 2003)
!         if not self.have_setup_ui:
!             self.SetupUI() 
  
      def OnSelectionChange(self):
          # See comments for OnNewExplorer below.
          if not self.have_setup_ui:
--- 641,655 ----
      # The Outlook event handlers
      def OnActivate(self):
+         #print "OnActivate", self
          # See comments for OnNewExplorer below.
          # *sigh* - OnActivate seems too early too for Outlook 2000,
          # but Outlook 2003 seems to work here, and *not* the folder switch etc
!         # Outlook 2000 crashes when a second window is created and we use this
!         # event
!         # OnViewSwitch however seems useful, so we ignore this.
!         pass
  
      def OnSelectionChange(self):
+         #print "OnSelChange", self
          # See comments for OnNewExplorer below.
          if not self.have_setup_ui:
***************
*** 647,661 ****
  
      def OnClose(self):
!         self.explorer_list.remove(self)
!         self.explorer_list = None
!         for button in self.buttons:
!             closer = getattr(button, "Close", None)
!             if closer is not None:
!                 closer()
          self.toolbar = None
-         self.buttons = []
          self.close() # disconnect events.
  
      def OnFolderSwitch(self):
          # Yet another worm-around for our event timing woes.  This may
          # be the first event ever seen for this explorer if, eg,
--- 659,670 ----
  
      def OnClose(self):
!         #print "OnClose", self
!         self.explorers_collection._DoDeadExplorer(self)
!         self.explorers_collection = None
          self.toolbar = None
          self.close() # disconnect events.
  
      def OnFolderSwitch(self):
+         #print "OnFolderSwitch", self
          # Yet another worm-around for our event timing woes.  This may
          # be the first event ever seen for this explorer if, eg,
***************
*** 692,697 ****
                  import traceback
                  traceback.print_exc()
!         self.but_recover_as.Visible = show_recover_as
!         self.but_delete_as.Visible = show_delete_as
  
  # Events from our "Explorers" collection (not an Explorer instance)
--- 701,713 ----
                  import traceback
                  traceback.print_exc()
!         if self.but_recover_as is not None:
!             self.but_recover_as.Visible = show_recover_as
!         if self.but_delete_as is not None:
!             self.but_delete_as.Visible = show_delete_as
! 
!     def OnViewSwitch(self):
!         #print "OnViewSwitch", self
!         if not self.have_setup_ui:
!             self.SetupUI()
  
  # Events from our "Explorers" collection (not an Explorer instance)
***************
*** 700,714 ****
          self.manager = manager
          self.explorers = []
  
      def Close(self):
          self.explorers = None
  
!     def _DoNewExplorer(self, explorer, do_activate):
          explorer = DispatchWithEvents(explorer, ExplorerWithEvents)
!         explorer.Init(self.manager, self.explorers)
!         if do_activate:
!             explorer.OnActivate()
          self.explorers.append(explorer)
  
      def OnNewExplorer(self, explorer):
          # NOTE - Outlook has a bug, as confirmed by many on Usenet, in
--- 716,741 ----
          self.manager = manager
          self.explorers = []
+         self.have_created_toolbar = False
+         self.button_event_map = {}
  
      def Close(self):
          self.explorers = None
  
!     def _DoNewExplorer(self, explorer):
          explorer = DispatchWithEvents(explorer, ExplorerWithEvents)
!         explorer.Init(self.manager, self)
          self.explorers.append(explorer)
  
+     def _DoDeadExplorer(self, explorer):
+         self.explorers.remove(explorer)
+         if len(self.explorers)==0:
+             # No more explorers - disconnect all events.
+             # (not doing this causes shutdown problems)
+             for tag, button in self.button_event_map.items():
+                 closer = getattr(button, "Close", None)
+                 if closer is not None:
+                     closer()
+             self.button_event_map = {}
+ 
      def OnNewExplorer(self, explorer):
          # NOTE - Outlook has a bug, as confirmed by many on Usenet, in
***************
*** 721,725 ****
          # view with no items (eg, Outlook Today) - so at the end of the
          # day, we can never assume we have been initialized!
!         self._DoNewExplorer(explorer, False)
  
  # The outlook Plugin COM object itself.
--- 748,752 ----
          # view with no items (eg, Outlook Today) - so at the end of the
          # day, we can never assume we have been initialized!
!         self._DoNewExplorer(explorer)
  
  # The outlook Plugin COM object itself.
***************
*** 755,767 ****
                      (get_version_string("Outlook"), get_version_string())
  
!             explorers = application.Explorers
!             # and Explorers events so we know when new explorers spring into life.
!             self.explorers_events = WithEvents(explorers, ExplorersEvent)
!             self.explorers_events.Init(self.manager)
!             # And hook our UI elements to all existing explorers
!             for i in range(explorers.Count):
!                 explorer = explorers.Item(i+1)
!                 self.explorers_events._DoNewExplorer(explorer, True)
!     
              if self.manager.config.filter.enabled:
                  # A little "sanity test" to help the user.  If our status is
--- 782,787 ----
                      (get_version_string("Outlook"), get_version_string())
  
!             self.explorers_events = None # create at OnStartupComplete
! 
              if self.manager.config.filter.enabled:
                  # A little "sanity test" to help the user.  If our status is
***************
*** 890,894 ****
          pass
      def OnStartupComplete(self, custom):
!         pass
      def OnBeginShutdown(self, custom):
          pass
--- 910,923 ----
          pass
      def OnStartupComplete(self, custom):
!         # Toolbar and other UI stuff must be setup once startup is complete.
!         explorers = self.application.Explorers
!         # and Explorers events so we know when new explorers spring into life.
!         self.explorers_events = WithEvents(explorers, ExplorersEvent)
!         self.explorers_events.Init(self.manager)
!         # And hook our UI elements to all existing explorers
!         for i in range(explorers.Count):
!             explorer = explorers.Item(i+1)
!             self.explorers_events._DoNewExplorer(explorer)
! 
      def OnBeginShutdown(self, custom):
          pass



From mhammond at users.sourceforge.net  Wed Jun 18 07:05:58 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Wed Jun 18 09:06:01 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000 addin.py,1.63,1.64
Message-ID: <E19ScdS-0005XE-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	addin.py 
Log Message:
"Anti-Spam Manager" -> "SpamBayes Manager"


Index: addin.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/addin.py,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** addin.py	18 Jun 2003 04:47:33 -0000	1.63
--- addin.py	18 Jun 2003 13:05:55 -0000	1.64
***************
*** 524,529 ****
                             constants.msoControlButton,
                             ButtonEvent, (manager.ShowManager,),
!                            Caption="Anti-Spam Manager...",
!                            TooltipText = "Show the Anti-Spam manager dialog.",
                             Enabled = True,
                             Visible=True,
--- 524,529 ----
                             constants.msoControlButton,
                             ButtonEvent, (manager.ShowManager,),
!                            Caption="SpamBayes Manager...",
!                            TooltipText = "Show the SpamBayes manager dialog.",
                             Enabled = True,
                             Visible=True,



From mhammond at users.sourceforge.net  Wed Jun 18 07:10:23 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Wed Jun 18 09:10:26 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000/docs
	troubleshooting.html, 1.7, 1.8
Message-ID: <E19Schj-0005gw-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	troubleshooting.html 
Log Message:
"Anti-Spam" -> "SpamBayes"


Index: troubleshooting.html
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/docs/troubleshooting.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** troubleshooting.html	4 Jun 2003 02:55:59 -0000	1.7
--- troubleshooting.html	18 Jun 2003 13:10:21 -0000	1.8
***************
*** 22,27 ****
  <hr style="width: 100%; height: 2px;">
  <h2><a name="Addin_doesnt_load"></a>Addin doesn't load</h2>
! When you start Outlook, there is no Anti-Spam item in the
! toolbar, and no filtering is happening.&nbsp; To resolve this:<br>
  <br>
  <ul>
--- 22,27 ----
  <hr style="width: 100%; height: 2px;">
  <h2><a name="Addin_doesnt_load"></a>Addin doesn't load</h2>
! When you start Outlook, there is no SpamBayes item in the
! toolbar, and no filtering occurs.&nbsp; To resolve this:<br>
  <br>
  <ul>
***************
*** 135,139 ****
  completely blank spam score.&nbsp; To resolve this:<br>
  <ul>
!   <li>Check that filtering is enabled.&nbsp; Select the Anti-Spam
  manager, then ensure the button Enable Filtering is checked.&nbsp; If
  you are unable to select this button due to insufficient training
--- 135,139 ----
  completely blank spam score.&nbsp; To resolve this:<br>
  <ul>
!   <li>Check that filtering is enabled.&nbsp; Select the SpamBayes
  manager, then ensure the button Enable Filtering is checked.&nbsp; If
  you are unable to select this button due to insufficient training
***************
*** 158,162 ****
    <li>If the messages are all scoring as "unsure", with a score of 0.5,
  then you may have lost your training database.&nbsp; From the <span
!  style="font-style: italic;">Anti-Spam manager </span>dropdown, check
  how many spam and ham have been loaded by the system.&nbsp; If this
  number is very low (like zero!) then you probably need to perform a
--- 158,162 ----
    <li>If the messages are all scoring as "unsure", with a score of 0.5,
  then you may have lost your training database.&nbsp; From the <span
!  style="font-style: italic;">SpamBayes manager </span>dropdown, check
  how many spam and ham have been loaded by the system.&nbsp; If this
  number is very low (like zero!) then you probably need to perform a
***************
*** 171,175 ****
    <ul>
      <li>Ensure the message is selected in the Outlook preview pane, and
! from the <span style="font-style: italic;">Anti-Spam manager</span>
  dropdown, select <span style="font-style: italic;">Show Spam clues for
  current message</span>.&nbsp; This should open a new mail message with
--- 171,175 ----
    <ul>
      <li>Ensure the message is selected in the Outlook preview pane, and
! from the <span style="font-style: italic;">SpamBayes manager</span>
  dropdown, select <span style="font-style: italic;">Show Spam clues for
  current message</span>.&nbsp; This should open a new mail message with



From mhammond at users.sourceforge.net  Wed Jun 18 07:10:23 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Wed Jun 18 09:10:28 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000 README.txt, 1.9,
	1.10 about.html, 1.12, 1.13
Message-ID: <E19Schj-0005gt-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	README.txt about.html 
Log Message:
"Anti-Spam" -> "SpamBayes"


Index: README.txt
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/README.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** README.txt	12 Feb 2003 22:02:16 -0000	1.9
--- README.txt	18 Jun 2003 13:10:20 -0000	1.10
***************
*** 9,13 ****
  ==========
  If you execute "addin.py", the Microsoft Outlook plugin will be installed.
! Next time outlook is started, you should see a "Anti-Spam" drop-down
  on the toolbar.  Clicking it will allow you to maintain your bayes database
  and filters.
--- 9,13 ----
  ==========
  If you execute "addin.py", the Microsoft Outlook plugin will be installed.
! Next time outlook is started, you should see a "SpamBayes" drop-down
  on the toolbar.  Clicking it will allow you to maintain your bayes database
  and filters.

Index: about.html
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/about.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** about.html	18 Jun 2003 01:56:18 -0000	1.12
--- about.html	18 Jun 2003 13:10:20 -0000	1.13
***************
*** 107,111 ****
  Start Outlook, select your Inbox, then look at your Outlook
  toolbar.&nbsp; Just below the standard Toolbar, you should see a new
! toolbar with an Anti-Spam
  dropdown button.&nbsp; If this button appears, then the plugin is
  correctly installed and ready to use.&nbsp; If the button does not
--- 107,111 ----
  Start Outlook, select your Inbox, then look at your Outlook
  toolbar.&nbsp; Just below the standard Toolbar, you should see a new
! toolbar with a <span style="font-style: italic;">SpamBayes</span>
  dropdown button.&nbsp; If this button appears, then the plugin is
  correctly installed and ready to use.&nbsp; If the button does not
***************
*** 129,134 ****
          <li>Configure and Train SpamBayes<br>
  Now we have our folders setup with some initial training data, we can
! configure the plugin.&nbsp; From the <span style="font-style: italic;">Anti-Spam</span>
! button on the toolbar select <span style="font-style: italic;">Anti-Spam
  Manager...</span>&nbsp; This will display the main dialog, as shown to
  the right.</li>
--- 129,134 ----
          <li>Configure and Train SpamBayes<br>
  Now we have our folders setup with some initial training data, we can
! configure the plugin.&nbsp; From the <span style="font-style: italic;">SpamBayes</span>
! button on the toolbar select <span style="font-style: italic;">SpamBayes
  Manager...</span>&nbsp; This will display the main dialog, as shown to
  the right.</li>
***************
*** 143,147 ****
  will be displayed as your messages are trained, and another progress
  indicator as they are scored.&nbsp; Close the training window to return
! to the Anti-Spam window.</li>
        </ol>
        </td>
--- 143,147 ----
  will be displayed as your messages are trained, and another progress
  indicator as they are scored.&nbsp; Close the training window to return
! to the SpamBayes window.</li>
        </ol>
        </td>
***************
*** 149,153 ****
   src="docs/images/manager.jpg" title="" alt="Anti-Spam manager"
   style="width: 369px; height: 335px;"><br>
!       <div style="text-align: center;">The Anti-Spam Manager dialog<br>
        <br>
        <img src="docs/images/training.jpg" title="" alt=""
--- 149,153 ----
   src="docs/images/manager.jpg" title="" alt="Anti-Spam manager"
   style="width: 369px; height: 335px;"><br>
!       <div style="text-align: center;">The SpamBayes Manager dialog<br>
        <br>
        <img src="docs/images/training.jpg" title="" alt=""
***************
*** 242,246 ****
  <h2><a name="Filtering"></a>Configuring the plugin for filtering</h2>
  Once the system is trained an configured, you are ready to enable the
! filtering capabilities.&nbsp; From the Anti-Spam manager, select <span
   style="font-style: italic;">Filters</span>.&nbsp; From this dialog you
  can select all the folders that you wish to watch for spam.&nbsp; You
--- 242,246 ----
  <h2><a name="Filtering"></a>Configuring the plugin for filtering</h2>
  Once the system is trained an configured, you are ready to enable the
! filtering capabilities.&nbsp; From the SpamBayes manager, select <span
   style="font-style: italic;">Filters</span>.&nbsp; From this dialog you
  can select all the folders that you wish to watch for spam.&nbsp; You



From mhammond at users.sourceforge.net  Wed Jun 18 07:15:13 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Wed Jun 18 09:15:16 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000/docs
	troubleshooting.html, 1.8, 1.9
Message-ID: <E19ScmP-0005sa-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	troubleshooting.html 
Log Message:
Add a link to the online version of the troubleshooting document.


Index: troubleshooting.html
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/docs/troubleshooting.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** troubleshooting.html	18 Jun 2003 13:10:21 -0000	1.8
--- troubleshooting.html	18 Jun 2003 13:15:11 -0000	1.9
***************
*** 19,23 ****
  </ul>
  There is also an <a href="http://spambayes.sourceforge.net/faq.html">online
! FAQ for SpamBayes</a> which may have additional information of use.<br>
  <hr style="width: 100%; height: 2px;">
  <h2><a name="Addin_doesnt_load"></a>Addin doesn't load</h2>
--- 19,26 ----
  </ul>
  There is also an <a href="http://spambayes.sourceforge.net/faq.html">online
! FAQ for SpamBayes</a> which may have additional information of
! use.&nbsp; You may also wish to see the <a
!  href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/spambayes/spambayes/Outlook2000/docs/troubleshooting.html?rev=HEAD">latest
! online version of this document</a> for problems added since release.<br>
  <hr style="width: 100%; height: 2px;">
  <h2><a name="Addin_doesnt_load"></a>Addin doesn't load</h2>



From mhammond at users.sourceforge.net  Wed Jun 18 07:29:48 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Wed Jun 18 09:29:51 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000/dialogs
	FolderSelector.py, 1.19, 1.20
Message-ID: <E19Sd0W-0006Vz-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	FolderSelector.py 
Log Message:
Naughty naughty me.


Index: FolderSelector.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/FolderSelector.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** FolderSelector.py	17 Jun 2003 04:16:39 -0000	1.19
--- FolderSelector.py	18 Jun 2003 13:29:46 -0000	1.20
***************
*** 89,93 ****
                      spec.children = None # Flag as "not yet built"
                  children.append(spec)
!         except pythoncom.com_error, details
              # Users have reported failure here - it is not clear if the
              # entire tree is going to fail, or just this folder
--- 89,93 ----
                      spec.children = None # Flag as "not yet built"
                  children.append(spec)
!         except pythoncom.com_error, details:
              # Users have reported failure here - it is not clear if the
              # entire tree is going to fail, or just this folder



From montanaro at users.sourceforge.net  Wed Jun 18 09:09:01 2003
From: montanaro at users.sourceforge.net (Skip Montanaro)
Date: Wed Jun 18 11:09:05 2003
Subject: [Spambayes-checkins] spambayes/spambayes tokenizer.py,1.11,1.12
Message-ID: <E19SeYX-0002Ho-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	tokenizer.py 
Log Message:
<comment>...</comment> is a Microsoft alternative for spelling <!-- ... -->
saw a message which used 

    Via<comment>6q5r7</comment>gra

to hide Viagra.  The usual HTML tag stripping didn't remove the nonsense
token.


Index: tokenizer.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/tokenizer.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tokenizer.py	20 May 2003 15:07:34 -0000	1.11
--- tokenizer.py	18 Jun 2003 15:08:59 -0000	1.12
***************
*** 1005,1010 ****
  class CommentStripper(Stripper):
      def __init__(self):
!         Stripper.__init__(self, re.compile(r"<!--").search,
!                                 re.compile(r"-->").search)
  
  crack_html_comment = CommentStripper().analyze
--- 1005,1011 ----
  class CommentStripper(Stripper):
      def __init__(self):
!         Stripper.__init__(self,
!                           re.compile(r"<!--|<\s*comment\s*[^>]*>").search,
!                           re.compile(r"-->|</comment>").search)
  
  crack_html_comment = CommentStripper().analyze



From mhammond at users.sourceforge.net  Thu Jun 19 17:47:42 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Thu Jun 19 19:47:46 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000/docs configuration.html,
	1.2, 1.3
Message-ID: <E19T982-0004hu-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	configuration.html 
Log Message:
Add a 'verbose' option to the options.  Formalize with a 
LogDebug(level, val, ...) method, and add some extra debugging
logs for toolbars.


Index: configuration.html
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/docs/configuration.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** configuration.html	18 Jun 2003 02:29:49 -0000	1.2
--- configuration.html	19 Jun 2003 23:47:40 -0000	1.3
***************
*** 166,169 ****
--- 166,184 ----
        </td>
      </tr>
+     <tr>
+       <td style="vertical-align: top;">[Genera]<br>
+       </td>
+       <td style="vertical-align: top;">verbose<br>
+       </td>
+       <td style="vertical-align: top;">Number<br>
+       </td>
+       <td style="vertical-align: top;">0<br>
+       </td>
+       <td style="vertical-align: top;">The level of debug output
+ generated by the program.&nbsp; This output is written to the standard
+ log for the application - see the <a href="troubleshooting.html">troubleshooting
+ guide</a> for information on locating the log.<br>
+       </td>
+     </tr>
    </tbody>
  </table>



From mhammond at users.sourceforge.net  Thu Jun 19 17:47:42 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Thu Jun 19 19:47:48 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000 manager.py, 1.61,
	1.62 addin.py, 1.64, 1.65 config.py, 1.12, 1.13
Message-ID: <E19T982-0004hy-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	manager.py addin.py config.py 
Log Message:
Add a 'verbose' option to the options.  Formalize with a 
LogDebug(level, val, ...) method, and add some extra debugging
logs for toolbars.


Index: manager.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/manager.py,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** manager.py	17 Jun 2003 04:07:43 -0000	1.61
--- manager.py	19 Jun 2003 23:47:40 -0000	1.62
***************
*** 238,241 ****
--- 238,247 ----
          self.LoadBayes()
  
+     def LogDebug(self, level, *args):
+         if self.verbose >= level:
+             for arg in args[:-1]:
+                 print arg,
+             print args[-1]
+ 
      def ReportError(self, message, title = None):
          ReportError(message, title)
***************
*** 361,367 ****
              
          folder = msgstore_folder.GetOutlookItem()
!         if self.verbose > 1:
!             print "Checking folder '%s' for our field '%s'" \
!                   % (self.config.general.field_score_name,folder.Name.encode("mbcs", "replace"))
          items = folder.Items
          item = items.GetFirst()
--- 367,372 ----
              
          folder = msgstore_folder.GetOutlookItem()
!         self.LogDebug(2, "Checking folder '%s' for our field '%s'" \
!                   % (self.config.general.field_score_name,folder.Name.encode("mbcs", "replace")))
          items = folder.Items
          item = items.GetFirst()
***************
*** 390,395 ****
                             format)
                      item.Save()
!                     if self.verbose > 1:
!                         print "Created the UserProperty!"
                  except pythoncom.com_error, details:
                      print "Warning: failed to create the Outlook " \
--- 395,399 ----
                             format)
                      item.Save()
!                     self.LogDebug(2, "Created the UserProperty!")
                  except pythoncom.com_error, details:
                      print "Warning: failed to create the Outlook " \
***************
*** 431,436 ****
              bayes = self.bayes
              message_db = self.message_db
!         if self.verbose:
!             print ("Bayes database initialized with "
                     "%d spam and %d good messages" % (bayes.nspam, bayes.nham))
          if len(message_db) != bayes.nham + bayes.nspam:
--- 435,439 ----
              bayes = self.bayes
              message_db = self.message_db
!         self.LogDebug(0, "Bayes database initialized with "
                     "%d spam and %d good messages" % (bayes.nspam, bayes.nham))
          if len(message_db) != bayes.nham + bayes.nspam:
***************
*** 440,445 ****
          self.message_db = message_db
          self.bayes_dirty = False
!         if self.verbose:
!             print "Loaded databases in %gms" % ((time.clock()-start)*1000)
  
      def PrepareConfig(self):
--- 443,447 ----
          self.message_db = message_db
          self.bayes_dirty = False
!         self.LogDebug(1, "Loaded databases in %gms" % ((time.clock()-start)*1000))
  
      def PrepareConfig(self):
***************
*** 490,493 ****
--- 492,500 ----
          # Now load it up
          self._MergeConfigFile(self.config_filename)
+         # Set global verbosity from the options file.
+         self.verbose = self.config.general.verbose
+         if self.verbose:
+             self.LogDebug(self.verbose, "System verbosity set to", self.verbose)
+ 
          self.MigrateOldPickle()
  
***************
*** 499,504 ****
              f = open(pickle_filename, 'rb')
          except IOError:
!             if self.verbose:
!                 print "No old pickle file to migrate"
              return
          print "Migrating old pickle '%s'" % pickle_filename
--- 506,510 ----
              f = open(pickle_filename, 'rb')
          except IOError:
!             self.LogDebug(1, "No old pickle file to migrate")
              return
          print "Migrating old pickle '%s'" % pickle_filename
***************
*** 533,542 ****
          # migrate will fail.  We save first, so failure here means next
          # attempt should still find the pickle.
!         if self.verbose:
!             print "pickle migration doing initial configuration save"
!         self.SaveConfig()
          try:
!             if self.verbose:
!                 print "pickle migration removing '%s'" % pickle_filename
              os.remove(pickle_filename)
          except os.error:
--- 539,545 ----
          # migrate will fail.  We save first, so failure here means next
          # attempt should still find the pickle.
!         self.LogDebug(1, "pickle migration doing initial configuration save")
          try:
!             self.LogDebug(1, "pickle migration removing '%s'" % pickle_filename)
              os.remove(pickle_filename)
          except os.error:
***************
*** 587,592 ****
          self.db_manager.store_mdb(self.message_db)
          self.bayes_dirty = False
!         if self.verbose:
!             print "Saved databases in %gms" % ((time.clock()-start)*1000)
  
      def GetClassifier(self):
--- 590,594 ----
          self.db_manager.store_mdb(self.message_db)
          self.bayes_dirty = False
!         self.LogDebug(1, "Saved databases in %gms" % ((time.clock()-start)*1000))
  
      def GetClassifier(self):

Index: addin.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/addin.py,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** addin.py	18 Jun 2003 13:05:55 -0000	1.64
--- addin.py	19 Jun 2003 23:47:40 -0000	1.65
***************
*** 641,645 ****
      # The Outlook event handlers
      def OnActivate(self):
!         #print "OnActivate", self
          # See comments for OnNewExplorer below.
          # *sigh* - OnActivate seems too early too for Outlook 2000,
--- 641,645 ----
      # The Outlook event handlers
      def OnActivate(self):
!         self.manager.LogDebug(2, "OnActivate", self)
          # See comments for OnNewExplorer below.
          # *sigh* - OnActivate seems too early too for Outlook 2000,
***************
*** 651,655 ****
  
      def OnSelectionChange(self):
!         #print "OnSelChange", self
          # See comments for OnNewExplorer below.
          if not self.have_setup_ui:
--- 651,655 ----
  
      def OnSelectionChange(self):
!         self.manager.LogDebug(2, "OnSelectionChange", self)
          # See comments for OnNewExplorer below.
          if not self.have_setup_ui:
***************
*** 659,663 ****
  
      def OnClose(self):
!         #print "OnClose", self
          self.explorers_collection._DoDeadExplorer(self)
          self.explorers_collection = None
--- 659,663 ----
  
      def OnClose(self):
!         self.manager.LogDebug(2, "OnClose", self)
          self.explorers_collection._DoDeadExplorer(self)
          self.explorers_collection = None
***************
*** 665,670 ****
          self.close() # disconnect events.
  
      def OnFolderSwitch(self):
!         #print "OnFolderSwitch", self
          # Yet another worm-around for our event timing woes.  This may
          # be the first event ever seen for this explorer if, eg,
--- 665,673 ----
          self.close() # disconnect events.
  
+     def OnBeforeFolderSwitch(self, new_folder, cancel):
+         self.manager.LogDebug(2, "OnBeforeFolderSwitch", self)
+ 
      def OnFolderSwitch(self):
!         self.manager.LogDebug(2, "OnFolderSwitch", self)
          # Yet another worm-around for our event timing woes.  This may
          # be the first event ever seen for this explorer if, eg,
***************
*** 706,711 ****
              self.but_delete_as.Visible = show_delete_as
  
      def OnViewSwitch(self):
!         #print "OnViewSwitch", self
          if not self.have_setup_ui:
              self.SetupUI()
--- 709,717 ----
              self.but_delete_as.Visible = show_delete_as
  
+     def OnBeforeViewSwitch(self, new_view, cancel):
+         self.manager.LogDebug(2, "OnBeforeViewSwitch", self)
+ 
      def OnViewSwitch(self):
!         self.manager.LogDebug(2, "OnViewSwitch", self)
          if not self.have_setup_ui:
              self.SetupUI()
***************
*** 924,935 ****
--- 930,945 ----
  
  def RegisterAddin(klass):
+     # prints to help debug binary install issues.
+     print "Starting register"
      import _winreg
      key = _winreg.CreateKey(_winreg.HKEY_CURRENT_USER,
                              "Software\\Microsoft\\Office\\Outlook\\Addins")
      subkey = _winreg.CreateKey(key, klass._reg_progid_)
+     print "Setting values"
      _winreg.SetValueEx(subkey, "CommandLineSafe", 0, _winreg.REG_DWORD, 0)
      _winreg.SetValueEx(subkey, "LoadBehavior", 0, _winreg.REG_DWORD, 3)
      _winreg.SetValueEx(subkey, "Description", 0, _winreg.REG_SZ, "SpamBayes anti-spam tool")
      _winreg.SetValueEx(subkey, "FriendlyName", 0, _winreg.REG_SZ, "SpamBayes")
+     print "Registration complete."
  
  def UnregisterAddin(klass):

Index: config.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/config.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** config.py	18 Jun 2003 02:29:49 -0000	1.12
--- config.py	19 Jun 2003 23:47:40 -0000	1.13
***************
*** 27,31 ****
  from spambayes.OptionsClass import OptionsClass, Option
  from spambayes.OptionsClass import RESTORE, DO_NOT_RESTORE
! from spambayes.OptionsClass import BOOLEAN, REAL, PATH
  
  class FolderIDOption(Option):
--- 27,31 ----
  from spambayes.OptionsClass import OptionsClass, Option
  from spambayes.OptionsClass import RESTORE, DO_NOT_RESTORE
! from spambayes.OptionsClass import BOOLEAN, INTEGER, REAL, PATH
  
  class FolderIDOption(Option):
***************
*** 101,104 ****
--- 101,107 ----
             also be set.""",
             MSG_READ_STATE, RESTORE),
+     ("verbose", "Changes the verbosity of the debug output from the program", 0,
+         """""",
+         INTEGER, RESTORE),
      ),
      "Training" : (



From npickett at users.sourceforge.net  Fri Jun 20 22:46:34 2003
From: npickett at users.sourceforge.net (Neale Pickett)
Date: Sat Jun 21 00:46:38 2003
Subject: [Spambayes-checkins] spambayes/spambayes hammiebulk.py,1.5,1.6
Message-ID: <E19TaGo-0005D3-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	hammiebulk.py 
Log Message:
* Makes untrain mode work (thanks Paramjit Oberoi)


Index: hammiebulk.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/hammiebulk.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** hammiebulk.py	29 Jan 2003 03:23:34 -0000	1.5
--- hammiebulk.py	21 Jun 2003 04:46:32 -0000	1.6
***************
*** 143,147 ****
      unknown = []
      reverse = 0
!     untrain = 0
      do_filter = False
      usedb = None
--- 143,147 ----
      unknown = []
      reverse = 0
!     untrain_mode = 0
      do_filter = False
      usedb = None
***************
*** 167,171 ****
              unknown.append(arg)
          elif opt == '-U':
!             untrain = 1
          elif opt == '-r':
              reverse = 1
--- 167,171 ----
              unknown.append(arg)
          elif opt == '-U':
!             untrain_mode = 1
          elif opt == '-r':
              reverse = 1
***************
*** 180,184 ****
      h = hammie.open(pck, usedb, mode)
  
!     if not untrain:
          for g in good:
              print "Training ham (%s):" % g
--- 180,184 ----
      h = hammie.open(pck, usedb, mode)
  
!     if not untrain_mode:
          for g in good:
              print "Training ham (%s):" % g



From bwarsaw at users.sourceforge.net  Sat Jun 21 11:06:05 2003
From: bwarsaw at users.sourceforge.net (Barry A. Warsaw)
Date: Sat Jun 21 13:06:11 2003
Subject: [Spambayes-checkins] spambayes INTEGRATION.txt,1.9,1.10
Message-ID: <E19TloT-0000QC-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	INTEGRATION.txt 
Log Message:
Updated some requirements re: Python version and email package
version.


Index: INTEGRATION.txt
===================================================================
RCS file: /cvsroot/spambayes/spambayes/INTEGRATION.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** INTEGRATION.txt	6 Jun 2003 17:08:12 -0000	1.9
--- INTEGRATION.txt	21 Jun 2003 17:06:03 -0000	1.10
***************
*** 41,61 ****
  ------------
  
! As a general requirement, you must have a recent version of Python installed
! on your computer, version 2.2 or later.  (Don't ask about backporting it to
! earlier versions of Python.  It's almost a certainty this won't happen.)  If
! you need to install Python on your system, check the Python download page
! for the version appropriate to your computer:
  
      http://www.python.org/download/
  
! You also need version 2.4.3 or above of the Python "email" package.  If
! you're running Python 2.3 (which at the time of writing is available
! from SourceForge CVS, or as the alpha version 2.3a1, available from
! python.org) then you already have this.  If not, you can download
! it from http://mimelib.sf.net and install it - unpack the archive, cd to
! the email-2.4.3 directory and type "python setup.py install" (YMMV on
! different platforms).  This will install it into your Python site-packages
! directory.  You'll also need to move aside the standard "email" library -
! go to your Python "Lib" directory and rename "email" to "email_old".
  
  
--- 41,66 ----
  ------------
  
! As a general requirement, you must have a recent version of Python
! installed on your computer, version 2.2 or later.  Python 2.2.3 is
! recommended.  (Don't ask about backporting it to earlier versions of
! Python.  It's almost a certainty this won't happen.)  If you need to
! install Python on your system, check the Python download page for the
! version appropriate to your computer:
  
      http://www.python.org/download/
  
! You also need version 2.4.3 or above of the Python "email" package.
! If you're running Python 2.2.3 or Python 2.3 (which at the time of
! writing is available from SourceForge CVS, or as the beta version
! 2.3b1, available from python.org) then you already have a good version
! of the email package.
! 
! If not, you can download email version 2.5 (as of this writing) from
! http://mimelib.sf.net and install it - unpack the archive, cd to the
! email-2.5 directory and type "python setup.py install" (YMMV on
! different platforms).  This will install it into your Python
! site-packages directory.  You'll also need to move aside the standard
! "email" library - go to your Python "Lib" directory and rename "email"
! to "email_old".
  
  



From anadelonbrin at users.sourceforge.net  Sat Jun 21 19:29:13 2003
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Sat Jun 21 21:29:17 2003
Subject: [Spambayes-checkins] spambayes imapfilter.py,1.44,1.45
Message-ID: <E19TtfN-0006fa-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	imapfilter.py 
Log Message:
imap4rev1 does not include RFC822.PEEK as a fetch option.
The correct response to this is 'bad', but we are currently
checking for 'no' (which is what Courier gives).

Change to allow for this behaviour (still falling back on RFC822).

Index: imapfilter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/imapfilter.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** imapfilter.py	12 Jun 2003 07:25:03 -0000	1.44
--- imapfilter.py	22 Jun 2003 01:29:11 -0000	1.45
***************
*** 110,113 ****
--- 110,114 ----
  
  from imaplib import Debug
+ from imaplib import error
  from imaplib import Time2Internaldate
  try:
***************
*** 320,324 ****
          # the status of the message.  Unfortunately, it appears that not
          # all IMAP servers support this, even though it is in RFC1730
!         response = imap.uid("FETCH", self.uid, self.rfc822_command)
          if response[0] != "OK":
              self.rfc822_command = "RFC822"
--- 321,329 ----
          # the status of the message.  Unfortunately, it appears that not
          # all IMAP servers support this, even though it is in RFC1730
!         try:
!             response = imap.uid("FETCH", self.uid, self.rfc822_command)
!         except error:
!             self.rfc822_command = "RFC822"
!             response = imap.uid("FETCH", self.uid, self.rfc822_command)
          if response[0] != "OK":
              self.rfc822_command = "RFC822"



From anadelonbrin at users.sourceforge.net  Sat Jun 21 19:44:55 2003
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Sat Jun 21 21:44:59 2003
Subject: [Spambayes-checkins] spambayes CHANGELOG.txt, 1.5,
	1.6 WHAT_IS_NEW.txt, 1.4, 1.5
Message-ID: <E19TtuZ-000703-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	CHANGELOG.txt WHAT_IS_NEW.txt 
Log Message:
Bring changelog and what's new up to date.

Index: CHANGELOG.txt
===================================================================
RCS file: /cvsroot/spambayes/spambayes/CHANGELOG.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CHANGELOG.txt	12 Jun 2003 07:25:02 -0000	1.5
--- CHANGELOG.txt	22 Jun 2003 01:44:53 -0000	1.6
***************
*** 250,251 ****
--- 250,270 ----
  Skip Montanaro  10/06/03    Correction to VM mailer addition to spambayes.el
  Tony Meyer  12/06/03    Update pop3proxy and imapfilter to print out version information.
+ Mark Hammond	16/06/03	Split OptionsClass into a separate file.
+ Mark Hammond	16/06/03	Allow lists to be used for multi-valued options.
+ Mark Hammond	16/06/03	Allow the first entry in the "defaults" table to be a sub-class of Option.
+ Mark Hammond	16/06/03	In Outlook plugin, when training, instead of suggesting the inbox, suggest folders we watch.
+ Mark Hammond	16/06/03	In Outlook plugin, change "Anti-Spam" on the dropdown to "SpamBayes"
+ Mark Hammond	16/06/03	In Outlook plugin, huge changes to configuration.  No longer use a pickle, but instead a series of .INI files.
+ Mark Hammond	17/06/03	2 new [General] options for Outlook plugin - delete_as_spam_message_state and recover_from_spam_message_state.
+ Mark Hammond	17/06/03	In Outlook plugin, prevent "Deleted items", Outbox and Sent Items from appearing in the folder list.  Fixes: [ 749277 ] Should prevent "Deleted Items" being target folder.
+ Mark Hammond	17/06/03	In Outlook plugin, catch the assertion error in the classifier, and warn the user their database is corrupt.
+ Mark Hammond	17/06/03	In Outlook plugin, introduce ReportErrorOnce, useful for errors on event handlers that you don't want to bombard the user with.
+ Mark Hammond	17/06/03	In Outlook plugin, an error on a single sub-folder need not be fatal.  Hopefully fixes [ 743515 ] Unable to expand folders in folder selection dialog.
+ Mark Hammond	17/06/03	In Outlook plugin, DeleteAsSpam didn't detect "no folder" correctly.
+ Anthony Baxter	17/06/03	In IMAPFilter interface, fix parm_map code.
+ Mark Hammond	18/06/03	In Outlook plugin, allow either spam or unsure messages to be marked as read as they are filtered.
+ Mark Hammond	18/06/03	In Outlook plugin, more work on the toolbar.
+ Mark Hammond	19/06/03	In Outlook plugin, change "Anti-Spam Manager" -> "SpamBayes Manager"
+ Mark Hammond	20/06/03	In Outlook plugin, add a 'verbose' option to the options.
+ Neale Pickett	21/06/03	In hammiefilter,  make untrain mode work.
+ Tony Meyer	22/06/03	Fix RFC822.PEEK error in imapfilter.

Index: WHAT_IS_NEW.txt
===================================================================
RCS file: /cvsroot/spambayes/spambayes/WHAT_IS_NEW.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** WHAT_IS_NEW.txt	12 Jun 2003 07:19:13 -0000	1.4
--- WHAT_IS_NEW.txt	22 Jun 2003 01:44:53 -0000	1.5
***************
*** 36,39 ****
--- 36,47 ----
   o In Outlook plugin, when filtering, saving the spam score is no longer
     fatal.
+  o 2 new [General] options - delete_as_spam_message_state and
+    recover_from_spam_message_state.
+  o Prevent "Deleted items", Outbox and Sent Items from appearing 
+    in the folder list.
+  o Allow either spam or unsure messages to be marked as read as they are filtered.
+  o Significant improvements to the toolbar.
+  o Standardised name from "Anti-Spam" to "Spambayes"
+  o Significant changes to configuration (moving from a pickle to .ini files).
  
  POP3 Proxy
***************
*** 105,108 ****
--- 113,117 ----
   o In muttrc, fix incorrect Spambayes header name.
   o Integrated code for the VM mailer into spambayes.el
+  o In hammiefilter,  make untrain mode work.
  
  
***************
*** 136,140 ****
  677804, 642740, 685746, 693423, 696995, 696476, 697120, 698852, 700165,
  704921, 707491, 725307, 725616, 725307, 725466, 726255, 728886, 715248,
! 733247, 737956, 737955, 706170, 737986
  
  A url containing the details of these bugs can be made by appending the
--- 145,149 ----
  677804, 642740, 685746, 693423, 696995, 696476, 697120, 698852, 700165,
  704921, 707491, 725307, 725616, 725307, 725466, 726255, 728886, 715248,
! 733247, 737956, 737955, 706170, 737986, 743515, 749277
  
  A url containing the details of these bugs can be made by appending the



From anadelonbrin at users.sourceforge.net  Sat Jun 21 20:00:46 2003
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Sat Jun 21 22:00:50 2003
Subject: [Spambayes-checkins] 
	website applications.ht, 1.8, 1.9 developer.ht,
	1.9, 1.10 download.ht, 1.6, 1.7 index.ht, 1.14, 1.15
Message-ID: <E19Tu9u-0007Je-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	applications.ht developer.ht download.ht index.ht 
Log Message:
Update for a3 release information.

Index: applications.ht
===================================================================
RCS file: /cvsroot/spambayes/website/applications.ht,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** applications.ht	22 May 2003 02:32:54 -0000	1.8
--- applications.ht	22 Jun 2003 02:00:44 -0000	1.9
***************
*** 18,22 ****
  <p>If you are going to use a source code version, you will also need:</p>
  <ul>
! <li>Python 2.2 or later (2.2.2 recommended)</li>
  <li>Python's <a href="http://starship.python.net/crew/mhammond">win32com</a>
  extensions (win32all-149 or later - currently ActivePython is not suitable)
--- 18,22 ----
  <p>If you are going to use a source code version, you will also need:</p>
  <ul>
! <li>Python 2.2 or later (2.2.3 recommended)</li>
  <li>Python's <a href="http://starship.python.net/crew/mhammond">win32com</a>
  extensions (win32all-149 or later - currently ActivePython is not suitable)
***************
*** 45,49 ****
  <h4>Requirements</h4>
  <ul>
! <li>Python 2.2 or later (2.2.2 recommended)</li>
  <li>Currently documentation focuses on Unix.</li>
  </ul>
--- 45,49 ----
  <h4>Requirements</h4>
  <ul>
! <li>Python 2.2 or later (2.2.3 recommended)</li>
  <li>Currently documentation focuses on Unix.</li>
  </ul>
***************
*** 59,63 ****
  <h4>Requirements</h4>
  <ul>
! <li>Python2.2 or later (2.2.2 recommended)</li>
  <li>Should work on windows/unix/whatever... </li>
  </ul>
--- 59,63 ----
  <h4>Requirements</h4>
  <ul>
! <li>Python2.2 or later (2.2.3 recommended)</li>
  <li>Should work on windows/unix/whatever... </li>
  </ul>
***************
*** 76,80 ****
  <h4>Requirements</h4>
  <ul>
! <li>Python2.2 or later (2.2.2 recommended)</li>
  <li>Should work on windows/unix/whatever... ?</li>
  </ul>
--- 76,80 ----
  <h4>Requirements</h4>
  <ul>
! <li>Python2.2 or later (2.2.3 recommended)</li>
  <li>Should work on windows/unix/whatever... ?</li>
  </ul>
***************
*** 92,96 ****
  <h4>Requirements</h4>
  <ul>
! <li>Python2.2 or later (2.2.2 recommended)</li>
  <li>The code is currently Unix-specific.</li>
  </ul>
--- 92,96 ----
  <h4>Requirements</h4>
  <ul>
! <li>Python2.2 or later (2.2.3 recommended)</li>
  <li>The code is currently Unix-specific.</li>
  </ul>

Index: developer.ht
===================================================================
RCS file: /cvsroot/spambayes/website/developer.ht,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** developer.ht	22 May 2003 02:10:13 -0000	1.9
--- developer.ht	22 Jun 2003 02:00:44 -0000	1.10
***************
*** 6,10 ****
  <p>So you want to get involved?</p>
  <h2>Running the code</h2>
! <p>This project works with either Python 2.2.2, Python 2.3 (currently in beta), 
  or on the bleeding edge of python code,
  available from <a href="http://sourceforge.net/cvs/?group_id=5470">CVS on
--- 6,10 ----
  <p>So you want to get involved?</p>
  <h2>Running the code</h2>
! <p>This project works with either Python 2.2.3, Python 2.3 (currently in beta), 
  or on the bleeding edge of python code,
  available from <a href="http://sourceforge.net/cvs/?group_id=5470">CVS on

Index: download.ht
===================================================================
RCS file: /cvsroot/spambayes/website/download.ht,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** download.ht	22 May 2003 17:19:36 -0000	1.6
--- download.ht	22 Jun 2003 02:00:44 -0000	1.7
***************
*** 10,15 ****
  
  <h2>Source Releases</h2>
! <p>The second pre-release of version 1.0 of the SpamBayes project is available.
! Download version 1.0a2 from the sourceforge <a href="https://sourceforge.net/project/showfiles.php?group_id=61702">Files</a> page as either a gzipped tarball or a zip file of the source files.
  </p>
  
--- 10,15 ----
  
  <h2>Source Releases</h2>
! <p>The third pre-release of version 1.0 of the SpamBayes project is available.
! Download version 1.0a3 from the sourceforge <a href="https://sourceforge.net/project/showfiles.php?group_id=61702">Files</a> page as either a gzipped tarball or a zip file of the source files.
  </p>
  

Index: index.ht
===================================================================
RCS file: /cvsroot/spambayes/website/index.ht,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** index.ht	28 May 2003 01:21:58 -0000	1.14
--- index.ht	22 Jun 2003 02:00:44 -0000	1.15
***************
*** 5,13 ****
  
  <h2>News</h2>
  <p>Spambayes (in particular the Outlook plugin) was recently featured in an
  <a href="http://www.infoworld.com/article/03/05/16/20TCspam_1.html?s=tc">
  InfoWorld article</a>, and
  <a href="http://weblog.infoworld.com/udell/2003/05/08.html">Jon Udell's blog</a>.</p>
- <p>Second pre-release available. See the <a href="download.html">download</a> page for more.</p>
  <h2>What is SpamBayes?</h2>
  <p>
--- 5,13 ----
  
  <h2>News</h2>
+ <p>Third pre-release available. See the <a href="download.html">download</a> page for more.</p>
  <p>Spambayes (in particular the Outlook plugin) was recently featured in an
  <a href="http://www.infoworld.com/article/03/05/16/20TCspam_1.html?s=tc">
  InfoWorld article</a>, and
  <a href="http://weblog.infoworld.com/udell/2003/05/08.html">Jon Udell's blog</a>.</p>
  <h2>What is SpamBayes?</h2>
  <p>



From bwarsaw at users.sourceforge.net  Sat Jun 21 21:04:16 2003
From: bwarsaw at users.sourceforge.net (Barry A. Warsaw)
Date: Sat Jun 21 23:04:19 2003
Subject: [Spambayes-checkins] spambayes imapfilter.py,1.45,1.46
Message-ID: <E19Tv9M-0000J2-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	imapfilter.py 
Log Message:
Fix an import and an except clause, since imaplib doesn't export a
module global `error'.

run(): Don't try to suck out the password from Options when -p is
used.  The default value is an empty tuple, so the index 0 isn't
valid.  No matter, that's why you supply the -p option after all.


Index: imapfilter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/imapfilter.py,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** imapfilter.py	22 Jun 2003 01:29:11 -0000	1.45
--- imapfilter.py	22 Jun 2003 03:04:14 -0000	1.46
***************
*** 110,114 ****
  
  from imaplib import Debug
! from imaplib import error
  from imaplib import Time2Internaldate
  try:
--- 110,114 ----
  
  from imaplib import Debug
! from imaplib import IMAP4
  from imaplib import Time2Internaldate
  try:
***************
*** 323,327 ****
          try:
              response = imap.uid("FETCH", self.uid, self.rfc822_command)
!         except error:
              self.rfc822_command = "RFC822"
              response = imap.uid("FETCH", self.uid, self.rfc822_command)
--- 323,327 ----
          try:
              response = imap.uid("FETCH", self.uid, self.rfc822_command)
!         except IMAP4.error:
              self.rfc822_command = "RFC822"
              response = imap.uid("FETCH", self.uid, self.rfc822_command)
***************
*** 698,702 ****
          server = options["imap", "server"][0]
          username = options["imap", "username"][0]
!         pwd = options["imap", "password"][0]
      else:
          if not launchUI:
--- 698,703 ----
          server = options["imap", "server"][0]
          username = options["imap", "username"][0]
!         if not promptForPass:
!             pwd = options["imap", "password"][0]
      else:
          if not launchUI:



From anadelonbrin at users.sourceforge.net  Sun Jun 22 20:54:10 2003
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Sun Jun 22 22:54:13 2003
Subject: [Spambayes-checkins] spambayes imapfilter.py,1.46,1.47
Message-ID: <E19UHT8-0002my-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	imapfilter.py 
Log Message:
Fix the -i switch.

Implement SF#755098 ("IMAP Filter: progress indicator").

When verbose is true, imapfilter now prints a '.' for each message
whose headers are requested.  This is replaced with a '*' if the body
is requested.

After classification/filtering, a summary of messages is printed (again,
if verbose is true).

Index: imapfilter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/imapfilter.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** imapfilter.py	22 Jun 2003 03:04:14 -0000	1.46
--- imapfilter.py	23 Jun 2003 02:54:07 -0000	1.47
***************
*** 109,113 ****
  from spambayes.Version import get_version_string
  
- from imaplib import Debug
  from imaplib import IMAP4
  from imaplib import Time2Internaldate
--- 109,112 ----
***************
*** 186,190 ****
      
      def __init__(self, server, port, debug=0, do_expunge=False):
-         Debug = debug  # this is a global in the imaplib module
          try:
              BaseIMAP.__init__(self, server, port)
--- 185,188 ----
***************
*** 196,199 ****
--- 194,198 ----
              print "Invalid server or port, please check these settings."
              sys.exit(-1)
+         self.debug = debug
          # For efficiency, we remember which folder we are currently
          # in, and only send a select command to the IMAP server if
***************
*** 346,349 ****
--- 345,350 ----
              self[options["pop3proxy", "mailid_header_name"]] = self.id
          self.got_substance = True
+         if options["globals", "verbose"]:
+             sys.stdout.write(chr(8) + "*")
  
      def MoveTo(self, dest):
***************
*** 366,369 ****
--- 367,371 ----
          response = imap.uid("FETCH", self.uid, "(FLAGS INTERNALDATE)")
          self._check(response, 'fetch (flags internaldate)')
+         #print response
          data = _extract_fetch_data(response[1][0])
          if data.has_key("INTERNALDATE"):
***************
*** 489,493 ****
          else:
              msg.setId(mo.group(1))
!         
          return msg
  
--- 491,497 ----
          else:
              msg.setId(mo.group(1))
! 
!         if options["globals", "verbose"]:
!             sys.stdout.write(".")
          return msg
  
***************
*** 525,532 ****
                  num_trained += 1
                  msg.RememberTrained(isSpam)
- 
          return num_trained                
  
      def Filter(self, classifier, spamfolder, unsurefolder):
          for msg in self:
              if msg.GetClassification() is None:
--- 529,539 ----
                  num_trained += 1
                  msg.RememberTrained(isSpam)
          return num_trained                
  
      def Filter(self, classifier, spamfolder, unsurefolder):
+         count = {}
+         count["ham"] = 0
+         count["spam"] = 0
+         count["unsure"] = 0
          for msg in self:
              if msg.GetClassification() is None:
***************
*** 540,552 ****
                  if cls == options["Hammie", "header_ham_string"]:
                      # we leave ham alone
!                     pass
                  elif cls == options["Hammie", "header_spam_string"]:
                      msg.MoveTo(spamfolder)
                  else:
                      msg.MoveTo(unsurefolder)
! 
                  msg.Save()
  
-             
  class IMAPFilter(object):
      def __init__(self, classifier):
--- 547,561 ----
                  if cls == options["Hammie", "header_ham_string"]:
                      # we leave ham alone
!                     count["ham"] += 1
                  elif cls == options["Hammie", "header_spam_string"]:
                      msg.MoveTo(spamfolder)
+                     count["spam"] += 1
                  else:
                      msg.MoveTo(unsurefolder)
!                     count["unsure"] += 1
                  msg.Save()
+         return count
+ 
  
  class IMAPFilter(object):
      def __init__(self, classifier):
***************
*** 598,601 ****
--- 607,611 ----
          if options["globals", "verbose"]:
              t = time.time()
+             count = None
  
          # Select the spam folder and unsure folder to make sure they exist
***************
*** 607,615 ****
              imap.SelectFolder(filter_folder)
              folder = IMAPFolder(filter_folder)
!             folder.Filter(self.classifier, self.spam_folder,
                            self.unsure_folder)
   
          if options["globals", "verbose"]:
!             print "Filtering took", time.time() - t, "seconds."
  
   
--- 617,628 ----
              imap.SelectFolder(filter_folder)
              folder = IMAPFolder(filter_folder)
!             count = folder.Filter(self.classifier, self.spam_folder,
                            self.unsure_folder)
   
          if options["globals", "verbose"]:
!             if count is not None:
!                 print "\nClassified %s ham, %s spam, and %s unsure." % \
!                       (count["ham"], count["spam"], count["unsure"])
!             print "Classifying took", time.time() - t, "seconds."
  
   



From anadelonbrin at users.sourceforge.net  Sun Jun 22 21:13:14 2003
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Sun Jun 22 23:13:18 2003
Subject: [Spambayes-checkins] spambayes imapfilter.py,1.47,1.48
Message-ID: <E19UHla-0003Ii-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	imapfilter.py 
Log Message:
If appending fails, try without including the flags, letting the user know
that flag information will be lost.

This is a band-aid fix - it would be much better to try and establish
which flags cannot be appended.

Index: imapfilter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/imapfilter.py,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** imapfilter.py	23 Jun 2003 02:54:07 -0000	1.47
--- imapfilter.py	23 Jun 2003 03:13:12 -0000	1.48
***************
*** 39,49 ****
  
  Warnings:
!     o This is very alpha.  The filter is currently being developed and
        tested.  We do *not* recommend using it on a production system unless
        you are confident that you can get your mail back if you lose it.  On
        the other hand, we do recommend that you test it for us and let us
!       know if anything does go wrong.  Once this appears in a release,
!       rather than just cvs, you can feel a *little* <wink> more confident
!       about using it.
      o By default, the filter does *not* delete, modify or move any of your
        mail.  Due to quirks in how imap works, new versions of your mail are
--- 39,47 ----
  
  Warnings:
!     o This is alpha software!  The filter is currently being developed and
        tested.  We do *not* recommend using it on a production system unless
        you are confident that you can get your mail back if you lose it.  On
        the other hand, we do recommend that you test it for us and let us
!       know if anything does go wrong.
      o By default, the filter does *not* delete, modify or move any of your
        mail.  Due to quirks in how imap works, new versions of your mail are
***************
*** 367,371 ****
          response = imap.uid("FETCH", self.uid, "(FLAGS INTERNALDATE)")
          self._check(response, 'fetch (flags internaldate)')
-         #print response
          data = _extract_fetch_data(response[1][0])
          if data.has_key("INTERNALDATE"):
--- 365,368 ----
***************
*** 383,386 ****
--- 380,391 ----
          response = imap.append(self.folder.name, flags,
                                 msg_time, self.as_string())
+         if response[0] == "NO":
+             # This may be because we have tried to set an invalid flag.
+             # Try again, losing all the flag information, but warn the
+             # user that this has happened.
+             response = imap.append(self.folder.name, None, msg_time,
+                                    self.as_string())
+             if response[0] == "OK":
+                 print "WARNING: Could not append flags: %s" % (flags,)
          self._check(response, 'append')
  



From anadelonbrin at users.sourceforge.net  Tue Jun 24 00:16:30 2003
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Tue Jun 24 02:16:34 2003
Subject: [Spambayes-checkins] spambayes/spambayes Options.py,1.55,1.56
Message-ID: <E19Uh6U-0003Mw-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	Options.py 
Log Message:
Implements sf#755095 IMAP Filter: move trained messages 

Note that this is deliberately not exposed via the ui, as I'm not sure how confusing it will be.  If lots of people ask for it, then it can be exposed.

Index: Options.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/Options.py,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** Options.py	16 Jun 2003 03:46:13 -0000	1.55
--- Options.py	24 Jun 2003 06:16:27 -0000	1.56
***************
*** 425,429 ****
   
      ("use_gary_combining", "Use gary-combining", False,
!      """The combining scheme currently detailed on the Robinon web page.
       The middle ground here is touchy, varying across corpus, and within
       a corpus across amounts of training data.  It almost never gives
--- 425,429 ----
   
      ("use_gary_combining", "Use gary-combining", False,
!      """The combining scheme currently detailed on the Robinson web page.
       The middle ground here is touchy, varying across corpus, and within
       a corpus across amounts of training data.  It almost never gives
***************
*** 871,874 ****
--- 871,900 ----
       """Comma delimited list of folders that will be examined for messages
       to train as spam.""",
+      IMAP_FOLDER, DO_NOT_RESTORE),
+ 
+     ("move_trained_spam_to_folder", "Folder to move trained spam to", "",
+      """When training, all messages in the spam training folder(s) (above)
+      are examined - if they are new, they are used to train, if not, they
+      are ignored.  This examination does take time, however, so if speed
+      is an issue for you, you may wish to move messages out of this folder
+      once they have been trained (either to delete them or to a storage
+      folder).  If a folder name is specified here, this will happen
+      automatically.  Note that the filter is not yet clever enough to
+      move the mail to different folders depending on which folder it
+      was originally in - *all* messages will be moved to the same
+      folder.""",
+      IMAP_FOLDER, DO_NOT_RESTORE),
+ 
+     ("move_trained_ham_to_folder", "Folder to move trained ham to", "",
+      """When training, all messages in the ham training folder(s) (above)
+      are examined - if they are new, they are used to train, if not, they
+      are ignored.  This examination does take time, however, so if speed
+      is an issue for you, you may wish to move messages out of this folder
+      once they have been trained (either to delete them or to a storage
+      folder).  If a folder name is specified here, this will happen
+      automatically.  Note that the filter is not yet clever enough to
+      move the mail to different folders depending on which folder it
+      was originally in - *all* messages will be moved to the same
+      folder.""",
       IMAP_FOLDER, DO_NOT_RESTORE),
    ),



From anadelonbrin at users.sourceforge.net  Tue Jun 24 00:16:29 2003
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Tue Jun 24 02:16:37 2003
Subject: [Spambayes-checkins] spambayes imapfilter.py,1.48,1.49
Message-ID: <E19Uh6T-0003Mu-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	imapfilter.py 
Log Message:
Implements sf#755095 IMAP Filter: move trained messages 

Note that this is deliberately not exposed via the ui, as I'm not sure how confusing it will be.  If lots of people ask for it, then it can be exposed.

Index: imapfilter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/imapfilter.py,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** imapfilter.py	23 Jun 2003 03:13:12 -0000	1.48
--- imapfilter.py	24 Jun 2003 06:16:27 -0000	1.49
***************
*** 534,537 ****
--- 534,545 ----
                  num_trained += 1
                  msg.RememberTrained(isSpam)
+                 if isSpam:
+                     move_opt_name = "move_trained_spam_to_folder"
+                 else:
+                     move_opt_name = "move_trained_ham_to_folder"
+                 if options["imap", move_opt_name] != "":
+                     msg.MoveTo(IMAPFolder(options["imap",
+                                                   move_opt_name]))
+                     msg.Save()
          return num_trained                
  



From mhammond at users.sourceforge.net  Tue Jun 24 18:44:20 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Tue Jun 24 20:44:25 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000/docs
	troubleshooting.html, 1.9, 1.10
Message-ID: <E19UyOa-0001kZ-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	troubleshooting.html 
Log Message:
Add a missing TOC entry.


Index: troubleshooting.html
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/docs/troubleshooting.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** troubleshooting.html	18 Jun 2003 13:15:11 -0000	1.9
--- troubleshooting.html	25 Jun 2003 00:44:17 -0000	1.10
***************
*** 13,16 ****
--- 13,18 ----
  <ul>
    <li><a href="#Addin_doesnt_load">Addin doesn't load</a></li>
+   <li><a href="#NoToolbar">Addin loads, but no toolbar items can be
+ seen</a></li>
    <li><a href="#Messages_fail_to_filter">Messages fail to filter</a></li>
    <li><a href="#Messages_have_incorrect_or_unexpected">Messages have



From anadelonbrin at users.sourceforge.net  Wed Jun 25 20:20:46 2003
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Wed Jun 25 22:20:55 2003
Subject: [Spambayes-checkins] website applications.ht, 1.9, 1.10 docs.ht,
	1.13, 1.14 windows.ht, 1.17, 1.18
Message-ID: <E19VMNS-0007QJ-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	applications.ht docs.ht windows.ht 
Log Message:
Remove outdated note.

Add note to doc page about Outlook "About" and "Troubleshooting"
files.

Update references to alpha2 to alpha3.

Index: applications.ht
===================================================================
RCS file: /cvsroot/spambayes/website/applications.ht,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** applications.ht	22 Jun 2003 02:00:44 -0000	1.9
--- applications.ht	26 Jun 2003 02:20:44 -0000	1.10
***************
*** 34,39 ****
  you might not.  A new binary that solves this problem will be released soon
  (it should be before the end of May), or alternatively you can use the CVS
! version, or alpha2 release.</p>
! <p><a href="download.html">Download the alpha2 release.</a></p>
  <p>Alternatively, you can use CVS to get the code - go <a href="http://sourceforge.net/cvs/?group_id=61702">to the CVS page</a> on the project's sourceforge site for more.</p>
  
--- 34,39 ----
  you might not.  A new binary that solves this problem will be released soon
  (it should be before the end of May), or alternatively you can use the CVS
! version, or alpha3 release.</p>
! <p><a href="download.html">Download the alpha3 release.</a></p>
  <p>Alternatively, you can use CVS to get the code - go <a href="http://sourceforge.net/cvs/?group_id=61702">to the CVS page</a> on the project's sourceforge site for more.</p>
  
***************
*** 50,54 ****
  
  <h4>Availability</h4>
! <p><a href="download.html">Download the alpha2 release.</a></p>
  <p>Alternatively, use CVS to get the code - go <a href="http://sourceforge.net/cvs/?group_id=61702">to the CVS page</a> on the project's sourceforge site for more.</p>
  
--- 50,54 ----
  
  <h4>Availability</h4>
! <p><a href="download.html">Download the alpha3 release.</a></p>
  <p>Alternatively, use CVS to get the code - go <a href="http://sourceforge.net/cvs/?group_id=61702">to the CVS page</a> on the project's sourceforge site for more.</p>
  
***************
*** 65,69 ****
  
  <h4>Availability</h4>
! <p><a href="download.html">Download the alpha2 release.</a></p>
  <p>Alternatively, use CVS to get the code - go <a href="http://sourceforge.net/cvs/?group_id=61702">to the CVS page</a> on the project's sourceforge site for more.</p>
  
--- 65,69 ----
  
  <h4>Availability</h4>
! <p><a href="download.html">Download the alpha3 release.</a></p>
  <p>Alternatively, use CVS to get the code - go <a href="http://sourceforge.net/cvs/?group_id=61702">to the CVS page</a> on the project's sourceforge site for more.</p>
  
***************
*** 82,86 ****
  
  <h4>Availability</h4>
! <p>You will need to use CVS to get the code - go <a href="http://sourceforge.net/cvs/?group_id=61702">to the CVS page</a> on the project's sourceforge site for more.</p>
  
  <h3><a name="mboxtrain">mboxtrain.py</a></h3>
--- 82,87 ----
  
  <h4>Availability</h4>
! <p><a href="download.html">Download the alpha3 release.</a></p>
! <p>Alternatively, use CVS to get the code - go <a href="http://sourceforge.net/cvs/?group_id=61702">to the CVS page</a> on the project's sourceforge site for more.</p>
  
  <h3><a name="mboxtrain">mboxtrain.py</a></h3>
***************
*** 97,100 ****
  
  <h4>Availability</h4>
! <p><a href="download.html">Download the alpha2 release.</a></p>
  <p>Alternatively, use CVS to get the code - go <a href="http://sourceforge.net/cvs/?group_id=61702">to the CVS page</a> on the project's sourceforge site for more.</p>
--- 98,101 ----
  
  <h4>Availability</h4>
! <p><a href="download.html">Download the alpha3 release.</a></p>
  <p>Alternatively, use CVS to get the code - go <a href="http://sourceforge.net/cvs/?group_id=61702">to the CVS page</a> on the project's sourceforge site for more.</p>

Index: docs.ht
===================================================================
RCS file: /cvsroot/spambayes/website/docs.ht,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** docs.ht	28 May 2003 12:34:44 -0000	1.13
--- docs.ht	26 Jun 2003 02:20:44 -0000	1.14
***************
*** 10,13 ****
--- 10,14 ----
  <li>A rudimentary set of <a href="faq.html">Frequently Asked Questions (FAQ)</a>.</li>
  <li>Instructions on <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/spambayes/spambayes/INTEGRATION.txt?rev=HEAD&content-type=text/plain">integrating Spambayes</a> into your mail system.</li>
+ <li>The Outlook plugin includes an <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/spambayes/spambayes/Outlook2000/about.html?rev=HEAD&content-type=text/plain">&quot;About&quot; File</a>, and a <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/spambayes/spambayes/Outlook2000/docs/troubleshooting.html?rev=HEAD&content-type=text/plain">&quot;Troubleshooting Guide&quot</a> that can be accessed via the toolbar.</li>
  <li>There's also a vast number of clues and notes scattered as block comments through the code.
  </ul>

Index: windows.ht
===================================================================
RCS file: /cvsroot/spambayes/website/windows.ht,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** windows.ht	17 Jun 2003 13:47:53 -0000	1.17
--- windows.ht	26 Jun 2003 02:20:44 -0000	1.18
***************
*** 127,137 ****
  href="applications.html#imap">IMAP</a>) which corresponds to the way in
  which you transfer mail from your mail server.
- 
- <h2>Notes</h2>
- 
- <ol>
-   <li> As of this writing, the last release (1.0a2) is getting rather
-   long-in-the-tooth.  You're probably better off either waiting for the next
-   alpha release or downloading the code from the <a
-   href="https://sourceforge.net/cvs/?group_id=61702">CVS repository</a>.</li>
- </ol>
\ No newline at end of file
--- 127,128 ----



From anadelonbrin at users.sourceforge.net  Wed Jun 25 21:06:35 2003
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Wed Jun 25 23:06:42 2003
Subject: [Spambayes-checkins] website faq.txt,1.5,1.6
Message-ID: <E19VN5n-0000IL-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	faq.txt 
Log Message:
Typo.

Index: faq.txt
===================================================================
RCS file: /cvsroot/spambayes/website/faq.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** faq.txt	26 Jun 2003 03:01:07 -0000	1.5
--- faq.txt	26 Jun 2003 03:06:32 -0000	1.6
***************
*** 353,357 ****
  or completely, or is being forced to shut down too quickly.  This version
  of the plug-in only saves training/configuration data on shut-down, so
! this can result in training/configuraton being lost.  To get around this
  problem, exit Outlook (not by restarting/shutting down the machine), and
  make sure that it is completely shut down (use the Task Manager to check).
--- 353,357 ----
  or completely, or is being forced to shut down too quickly.  This version
  of the plug-in only saves training/configuration data on shut-down, so
! this can result in training/configuration being lost.  To get around this
  problem, exit Outlook (not by restarting/shutting down the machine), and
  make sure that it is completely shut down (use the Task Manager to check).



From tim_one at users.sourceforge.net  Thu Jun 26 18:32:02 2003
From: tim_one at users.sourceforge.net (Tim Peters)
Date: Thu Jun 26 20:32:05 2003
Subject: [Spambayes-checkins] spambayes/spambayes storage.py,1.8,1.9
Message-ID: <E19Vh9m-0005X3-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	storage.py 
Log Message:
_wordinfoget():  If the word isn't in the cache, and it's also a
WORD_DELETED, honor the deletion by returning None.  Before it was
trying to look word up in the Shelf even if it was marked deleted.


Index: storage.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/storage.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** storage.py	30 May 2003 03:06:55 -0000	1.8
--- storage.py	27 Jun 2003 00:31:59 -0000	1.9
***************
*** 213,221 ****
          except KeyError:
              ret = None
!             r = self.db.get(word)
!             if r:
!                 ret = self.WordInfoClass()
!                 ret.__setstate__(r)
!                 self.wordinfo[word] = ret
              return ret
  
--- 213,222 ----
          except KeyError:
              ret = None
!             if self.changed_words.get(word) is not WORD_DELETED:
!                 r = self.db.get(word)
!                 if r:
!                     ret = self.WordInfoClass()
!                     ret.__setstate__(r)
!                     self.wordinfo[word] = ret
              return ret
  



From tim_one at users.sourceforge.net  Thu Jun 26 18:38:58 2003
From: tim_one at users.sourceforge.net (Tim Peters)
Date: Thu Jun 26 20:39:01 2003
Subject: [Spambayes-checkins] spambayes/spambayes storage.py,1.9,1.10
Message-ID: <E19VhGU-0005iG-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	storage.py 
Log Message:
_wordinfoset():  Removed what looks like a superstitious test that record
isn't None (although it wasn't explicitly checking for None, and it's
unclear what it was checking for).


Index: storage.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/storage.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** storage.py	27 Jun 2003 00:31:59 -0000	1.9
--- storage.py	27 Jun 2003 00:38:56 -0000	1.10
***************
*** 231,235 ****
          # as much as 60%!!!  This also has the effect of reducing the time it
          # takes to store the database
!         if record and (record.spamcount+record.hamcount <= 1):
              self.db[word] = record.__getstate__()
              # Remove this word from the changed list (not that it should be
--- 231,235 ----
          # as much as 60%!!!  This also has the effect of reducing the time it
          # takes to store the database
!         if record.spamcount + record.hamcount <= 1:
              self.db[word] = record.__getstate__()
              # Remove this word from the changed list (not that it should be



From tim_one at users.sourceforge.net  Thu Jun 26 18:41:22 2003
From: tim_one at users.sourceforge.net (Tim Peters)
Date: Thu Jun 26 20:41:25 2003
Subject: [Spambayes-checkins] spambayes/spambayes storage.py,1.10,1.11
Message-ID: <E19VhIo-0005no-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	storage.py 
Log Message:
Assorted:  Always compare against WORD_CHANGED and WORD_DELETED via "is"
instead of equality tests.  These are singleton objects defined by the
module, so "is" is appropriate; "==" instead suggests that anyone can
reach into these data structures and plug in random strings instead, which
isn't the intent.


Index: storage.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/storage.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** storage.py	27 Jun 2003 00:38:56 -0000	1.10
--- storage.py	27 Jun 2003 00:41:20 -0000	1.11
***************
*** 186,193 ****
          # For now, just do it the naive way.
          for key, flag in self.changed_words.items():
!             if flag == WORD_CHANGED:
                  val = self.wordinfo[key]
                  self.db[key] = val.__getstate__()
!             elif flag == WORD_DELETED:
                  assert word not in self.wordinfo, \
                         "Should not have a wordinfo for words flagged for delete"
--- 186,193 ----
          # For now, just do it the naive way.
          for key, flag in self.changed_words.items():
!             if flag is WORD_CHANGED:
                  val = self.wordinfo[key]
                  self.db[key] = val.__getstate__()
!             elif flag is WORD_DELETED:
                  assert word not in self.wordinfo, \
                         "Should not have a wordinfo for words flagged for delete"



From tim_one at users.sourceforge.net  Thu Jun 26 18:43:24 2003
From: tim_one at users.sourceforge.net (Tim Peters)
Date: Thu Jun 26 20:43:27 2003
Subject: [Spambayes-checkins] spambayes/spambayes storage.py,1.11,1.12
Message-ID: <E19VhKm-0005qb-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	storage.py 
Log Message:
store():  Use iteritems() instead of items() to materialize the
changed_words guts; we're not mutating changed_words here, so there's
no need to materialize a possibly giant list of 2-tuples.


Index: storage.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/storage.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** storage.py	27 Jun 2003 00:41:20 -0000	1.11
--- storage.py	27 Jun 2003 00:43:22 -0000	1.12
***************
*** 185,189 ****
          # lock while we copy and reset self.changed_words would be appropriate.
          # For now, just do it the naive way.
!         for key, flag in self.changed_words.items():
              if flag is WORD_CHANGED:
                  val = self.wordinfo[key]
--- 185,189 ----
          # lock while we copy and reset self.changed_words would be appropriate.
          # For now, just do it the naive way.
!         for key, flag in self.changed_words.iteritems():
              if flag is WORD_CHANGED:
                  val = self.wordinfo[key]



From tim_one at users.sourceforge.net  Thu Jun 26 18:45:23 2003
From: tim_one at users.sourceforge.net (Tim Peters)
Date: Thu Jun 26 20:45:26 2003
Subject: [Spambayes-checkins] spambayes/spambayes storage.py,1.12,1.13
Message-ID: <E19VhMh-0005ti-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	storage.py 
Log Message:
store():  If a Shelf db doesn't have a key, then "del db[key]" should
raise KeyError.


Index: storage.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/storage.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** storage.py	27 Jun 2003 00:43:22 -0000	1.12
--- storage.py	27 Jun 2003 00:45:21 -0000	1.13
***************
*** 193,201 ****
                         "Should not have a wordinfo for words flagged for delete"
                  # Word may be deleted before it was ever written.
!                 # hrmph - working out what exceptions would be reasonable is
!                 # a PITA (but anydbm.errors may be useful) - but for now,
!                 # just check the key first.
!                 if self.db.has_key(key):
                      del self.db[key]
              else:
                  raise RuntimeError, "Unknown flag value"
--- 193,200 ----
                         "Should not have a wordinfo for words flagged for delete"
                  # Word may be deleted before it was ever written.
!                 try:
                      del self.db[key]
+                 except KeyError:
+                     pass
              else:
                  raise RuntimeError, "Unknown flag value"



From tim_one at users.sourceforge.net  Fri Jun 27 19:51:59 2003
From: tim_one at users.sourceforge.net (Tim Peters)
Date: Fri Jun 27 21:52:02 2003
Subject: [Spambayes-checkins] spambayes/spambayes tokenizer.py,1.12,1.13
Message-ID: <E19W4sh-0007pB-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	tokenizer.py 
Log Message:
A new stripper to squash yet another way of hiding content in HTML spam,
like

    Ere<frame><noframes>ywl55</noframes></frame>ctions

to hide Erections.  I haven't seen this often yet, but (of course) it's
been effective so far.


Index: tokenizer.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/tokenizer.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tokenizer.py	18 Jun 2003 15:08:59 -0000	1.12
--- tokenizer.py	28 Jun 2003 01:51:57 -0000	1.13
***************
*** 1011,1014 ****
--- 1011,1022 ----
  crack_html_comment = CommentStripper().analyze
  
+ # Nuke stuff between <noframes> </noframes> tags.
+ class NoframesStripper(Stripper):
+     def __init__(self):
+         Stripper.__init__(self,
+                           re.compile(r"<\s*noframes\s*>").search,
+                           re.compile(r"</noframes\s*>").search)
+ 
+ crack_noframes = NoframesStripper().analyze
  
  # Scan HTML for constructs often seen in viruses and worms.
***************
*** 1392,1396 ****
                              crack_urls,
                              crack_html_style,
!                             crack_html_comment):
                  text, tokens = cracker(text)
                  for t in tokens:
--- 1400,1405 ----
                              crack_urls,
                              crack_html_style,
!                             crack_html_comment,
!                             crack_noframes):
                  text, tokens = cracker(text)
                  for t in tokens:



From mhammond at users.sourceforge.net  Sun Jun 29 19:06:24 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Sun Jun 29 21:06:28 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000 manager.py,1.62,1.63
Message-ID: <E19Wn7g-0007zz-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	manager.py 
Log Message:
Log the repr() of messages displayed in a dialog, as they often have
embedded \r\n chars - repr() keeps the whole thing to a single line.


Index: manager.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/manager.py,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** manager.py	19 Jun 2003 23:47:40 -0000	1.62
--- manager.py	30 Jun 2003 01:06:21 -0000	1.63
***************
*** 95,99 ****
  def ReportError(message, title = None):
      import traceback
!     print "ERROR:", message
      traceback.print_exc()
      if title is None:
--- 95,99 ----
  def ReportError(message, title = None):
      import traceback
!     print "ERROR:", repr(message)
      traceback.print_exc()
      if title is None:
***************
*** 267,271 ****
              # We have reported the error, but for the sake of the log, we
              # still want it logged there.
!             print "ERROR:", message
              traceback.print_exc()
  
--- 267,271 ----
              # We have reported the error, but for the sake of the log, we
              # still want it logged there.
!             print "ERROR:", repr(message)
              traceback.print_exc()
  
***************
*** 273,277 ****
          if key is None: key = msg
          # Always print the message and traceback.
!         print "ERROR:", msg
          traceback.print_exc()
          if key in self.reported_error_map:
--- 273,277 ----
          if key is None: key = msg
          # Always print the message and traceback.
!         print "ERROR:", repr(msg)
          traceback.print_exc()
          if key in self.reported_error_map:



From mhammond at users.sourceforge.net  Mon Jun 30 04:37:34 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Mon Jun 30 06:37:37 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000 addin.py,1.65,1.66
Message-ID: <E19Ww2Q-0000IG-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	addin.py 
Log Message:
Don't (try to) do OnStartupComplete work if OnConnection failed.


Index: addin.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/addin.py,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** addin.py	19 Jun 2003 23:47:40 -0000	1.65
--- addin.py	30 Jun 2003 10:37:32 -0000	1.66
***************
*** 720,723 ****
--- 720,724 ----
  class ExplorersEvent:
      def Init(self, manager):
+         assert self.manager
          self.manager = manager
          self.explorers = []
***************
*** 918,928 ****
          # Toolbar and other UI stuff must be setup once startup is complete.
          explorers = self.application.Explorers
!         # and Explorers events so we know when new explorers spring into life.
!         self.explorers_events = WithEvents(explorers, ExplorersEvent)
!         self.explorers_events.Init(self.manager)
!         # And hook our UI elements to all existing explorers
!         for i in range(explorers.Count):
!             explorer = explorers.Item(i+1)
!             self.explorers_events._DoNewExplorer(explorer)
  
      def OnBeginShutdown(self, custom):
--- 919,930 ----
          # Toolbar and other UI stuff must be setup once startup is complete.
          explorers = self.application.Explorers
!         if self.manager is not None: # If we successfully started up.
!             # and Explorers events so we know when new explorers spring into life.
!             self.explorers_events = WithEvents(explorers, ExplorersEvent)
!             self.explorers_events.Init(self.manager)
!             # And hook our UI elements to all existing explorers
!             for i in range(explorers.Count):
!                 explorer = explorers.Item(i+1)
!                 self.explorers_events._DoNewExplorer(explorer)
  
      def OnBeginShutdown(self, custom):



From mhammond at users.sourceforge.net  Mon Jun 30 04:50:04 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Mon Jun 30 06:50:07 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000 addin.py,1.66,1.67
Message-ID: <E19WwEW-0000kL-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	addin.py 
Log Message:
Oops - typo


Index: addin.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/addin.py,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** addin.py	30 Jun 2003 10:37:32 -0000	1.66
--- addin.py	30 Jun 2003 10:50:02 -0000	1.67
***************
*** 720,724 ****
  class ExplorersEvent:
      def Init(self, manager):
!         assert self.manager
          self.manager = manager
          self.explorers = []
--- 720,724 ----
  class ExplorersEvent:
      def Init(self, manager):
!         assert manager
          self.manager = manager
          self.explorers = []



From mhammond at users.sourceforge.net  Mon Jun 30 18:43:49 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Mon Jun 30 20:43:55 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000 addin.py,1.67,1.68
Message-ID: <E19X9FN-0002vM-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	addin.py 
Log Message:
Toolbar was not initialized when "Outlook Today" was the default view.


Index: addin.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/addin.py,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** addin.py	30 Jun 2003 10:50:02 -0000	1.67
--- addin.py	1 Jul 2003 00:43:47 -0000	1.68
***************
*** 14,17 ****
--- 14,19 ----
  if sys.version_info >= (2, 3):
      # sick off the new hex() warnings!
+     # todo - remove this - win32all has removed all these warnings
+     # (but we will wait some time for people to update)
      warnings.filterwarnings("ignore", category=FutureWarning, append=1)
  
***************
*** 733,736 ****
--- 735,739 ----
          explorer.Init(self.manager, self)
          self.explorers.append(explorer)
+         return explorer
  
      def _DoDeadExplorer(self, explorer):
***************
*** 926,930 ****
              for i in range(explorers.Count):
                  explorer = explorers.Item(i+1)
!                 self.explorers_events._DoNewExplorer(explorer)
  
      def OnBeginShutdown(self, custom):
--- 929,934 ----
              for i in range(explorers.Count):
                  explorer = explorers.Item(i+1)
!                 explorer = self.explorers_events._DoNewExplorer(explorer)
!                 explorer.OnFolderSwitch()
  
      def OnBeginShutdown(self, custom):



From anadelonbrin at users.sourceforge.net  Mon Jun 30 18:50:13 2003
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Mon Jun 30 20:50:15 2003
Subject: [Spambayes-checkins] website docs.ht, 1.14, 1.15 faq.txt, 1.6,
	1.7 related.ht, 1.8, 1.9
Message-ID: <E19X9LZ-00034k-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	docs.ht faq.txt related.ht 
Log Message:
Add notes about InBoxer and SpamAtBay to related.html.

Add FAQ about white/black listing.

Add note to Outlook documentation to avoid confusion when
the online documentation is more advanced than the version
they are using.

Index: docs.ht
===================================================================
RCS file: /cvsroot/spambayes/website/docs.ht,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** docs.ht	26 Jun 2003 02:20:44 -0000	1.14
--- docs.ht	1 Jul 2003 00:50:11 -0000	1.15
***************
*** 10,14 ****
  <li>A rudimentary set of <a href="faq.html">Frequently Asked Questions (FAQ)</a>.</li>
  <li>Instructions on <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/spambayes/spambayes/INTEGRATION.txt?rev=HEAD&content-type=text/plain">integrating Spambayes</a> into your mail system.</li>
! <li>The Outlook plugin includes an <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/spambayes/spambayes/Outlook2000/about.html?rev=HEAD&content-type=text/plain">&quot;About&quot; File</a>, and a <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/spambayes/spambayes/Outlook2000/docs/troubleshooting.html?rev=HEAD&content-type=text/plain">&quot;Troubleshooting Guide&quot</a> that can be accessed via the toolbar.</li>
  <li>There's also a vast number of clues and notes scattered as block comments through the code.
  </ul>
--- 10,16 ----
  <li>A rudimentary set of <a href="faq.html">Frequently Asked Questions (FAQ)</a>.</li>
  <li>Instructions on <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/spambayes/spambayes/INTEGRATION.txt?rev=HEAD&content-type=text/plain">integrating Spambayes</a> into your mail system.</li>
! <li>The Outlook plugin includes an <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/spambayes/spambayes/Outlook2000/about.html?rev=HEAD&content-type=text/plain">&quot;About&quot; File</a>, and a <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/spambayes/spambayes/Outlook2000/docs/troubleshooting.html?rev=HEAD&content-type=text/plain">&quot;Troubleshooting Guide&quot</a> that can be accessed via the toolbar.
! (Note that the online documentaton is always for the <strong>latest source</strong> version, and so might not correspond exactly with the version you are using.
! Always start with the documentation that came with the version you installed.)</li>
  <li>There's also a vast number of clues and notes scattered as block comments through the code.
  </ul>

Index: faq.txt
===================================================================
RCS file: /cvsroot/spambayes/website/faq.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** faq.txt	26 Jun 2003 03:06:32 -0000	1.6
--- faq.txt	1 Jul 2003 00:50:11 -0000	1.7
***************
*** 714,717 ****
--- 714,735 ----
  
  
+ Why don't you add whitelisting/blacklisting to SpamBayes?
+ ---------------------------------------------------------
+ 
+ The main reason is that for the most part SpamBayes doesn't need it!  As
+ long as you keep training on unsure or mis-classified mail, SpamBayes will
+ learn what you consider good mail without needing any specific lists. In
+ addition, tokens are generated from email addresses, so an automatic
+ 'whitelist' (of sorts) is generated, as is a similar blacklist.
+ 
+ These sorts of lists are problematic, because 'spoofing' (pretending you
+ are someone else) is reasonably simple, and also fairly common.  So, more
+ often than not, they'll lead to incorrect results.  However, there are some
+ commercial products based on SpamBayes that offer whitelisting - see the
+ `related page`_ for more information.
+ 
+ .. _related page: related.html
+ 
+ 
  What do I need to do to update the FAQ?
  ---------------------------------------

Index: related.ht
===================================================================
RCS file: /cvsroot/spambayes/website/related.ht,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** related.ht	31 Jan 2003 12:17:29 -0000	1.8
--- related.ht	1 Jul 2003 00:50:11 -0000	1.9
***************
*** 17,20 ****
--- 17,27 ----
  <li><a href="http://www.spambully.com/">Spam Bully</a> is a commercial spam filter that claims to use bayesian techniques.
  </ul>
+ <h2>Projects based on SpamBayes</h2>
+ <p>These are some projects that are based on SpamBayes.  Those that are commercial offer the same success in filtering mail, but in exchange for forking out some money, may be more user-friendly and offer more in the way of support.
+ <ul>
+ <li>SpamAtBay is a soon to be available commercial version of the SpamBayes addin for Outlook.  SpamAtBay development is headed by Sean True, who wrote the first integration of Outlook and SpamBayes (later this was improved on - basically rewritten using the same idea - by Mark Hammond).
+ SpamAtBay has a more polished layout, documentation and some more consumer oriented features.  Contact <a href="mailto:seant@webreply.com ">Sean True</a> for more information.</li>
+ <li><a href="http://www.inboxer.com">InBoxer</a>.  This is a consumer-oriented release with a simple one-click install process, based on SpamAtBay (in turn, based on SpamBayes). Contact <a href="mailto:info@inboxer.com">Roger Matys</a> for more information.</li>
+ </ul>
  
  



From mhammond at users.sourceforge.net  Mon Jun 30 18:58:30 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Mon Jun 30 20:58:33 2003
Subject: [Spambayes-checkins] spambayes/spambayes Version.py,1.3,1.4
Message-ID: <E19X9Ta-0003Ie-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	Version.py 
Log Message:
Time flies when you are having fun <wink>


Index: Version.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/Version.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Version.py	12 Jun 2003 07:19:14 -0000	1.3
--- Version.py	1 Jul 2003 00:58:28 -0000	1.4
***************
*** 22,26 ****
              "BinaryVersion":    003,
              "Description":      "SpamBayes Outlook Addin Beta1",
!             "Date":             "June 2003",
              "Full Description": "%(Description)s, version %(Version)s (%(Date)s)",
              "Full Description Binary":
--- 22,26 ----
              "BinaryVersion":    003,
              "Description":      "SpamBayes Outlook Addin Beta1",
!             "Date":             "July 2003",
              "Full Description": "%(Description)s, version %(Version)s (%(Date)s)",
              "Full Description Binary":



From mhammond at users.sourceforge.net  Mon Jun 30 19:13:34 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Mon Jun 30 21:13:37 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000 about.html,1.13,1.14
Message-ID: <E19X9iA-0003ov-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	about.html 
Log Message:
Tell the users how to re-display this documentation.


Index: about.html
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/about.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** about.html	18 Jun 2003 13:10:20 -0000	1.13
--- about.html	1 Jul 2003 01:13:32 -0000	1.14
***************
*** 6,9 ****
--- 6,16 ----
  <body>
  <h1>SpamBayes Outlook Plugin</h1>
+ Thank you for trying the SpamBayes anti-spam Outlook addin.&nbsp; You
+ can view this documentation at any time by starting Outlook, selecting
+ the <span style="font-style: italic;">SpamBayes Manager</span> option
+ from the new <span style="font-style: italic;">SpamBayes </span>toolbar
+ you will see, and selecting the <span style="font-style: italic;">About
+ </span>button.<br>
+ <br>
  This plugin provides a spam filter based on statistical analysis of
  your personal mail. &nbsp;Unlike other spam detection systems,



From montanaro at users.sourceforge.net  Mon Jun 30 19:19:53 2003
From: montanaro at users.sourceforge.net (Skip Montanaro)
Date: Mon Jun 30 21:19:56 2003
Subject: [Spambayes-checkins] spambayes/spambayes storage.py,1.13,1.14
Message-ID: <E19X9oH-00041y-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	storage.py 
Log Message:
Encode unicode objects as utf-8 before using as a key for DBDictClassifier
instances.



Index: storage.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/storage.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** storage.py	27 Jun 2003 00:45:21 -0000	1.13
--- storage.py	1 Jul 2003 01:19:51 -0000	1.14
***************
*** 208,211 ****
--- 208,213 ----
  
      def _wordinfoget(self, word):
+         if isinstance(word, unicode):
+             word = word.encode("utf-8")
          try:
              return self.wordinfo[word]
***************
*** 230,233 ****
--- 232,237 ----
          # as much as 60%!!!  This also has the effect of reducing the time it
          # takes to store the database
+         if isinstance(word, unicode):
+             word = word.encode("utf-8")
          if record.spamcount + record.hamcount <= 1:
              self.db[word] = record.__getstate__()
***************
*** 243,246 ****
--- 247,252 ----
  
      def _wordinfodel(self, word):
+         if isinstance(word, unicode):
+             word = word.encode("utf-8")
          del self.wordinfo[word]
          self.changed_words[word] = WORD_DELETED



From mhammond at users.sourceforge.net  Mon Jun 30 21:15:39 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Mon Jun 30 23:15:43 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000 addin.py,1.68,1.69
Message-ID: <E19XBcJ-0007t8-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	addin.py 
Log Message:
Display a message for "Delete as Spam" or "Recover from Spam" when
SpamBayes is not enabled.


Index: addin.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/addin.py,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** addin.py	1 Jul 2003 00:43:47 -0000	1.68
--- addin.py	1 Jul 2003 03:15:37 -0000	1.69
***************
*** 358,361 ****
--- 358,369 ----
          if not msgstore_messages:
              return
+         # If we are not yet enabled, tell the user.
+         # (This is better than disabling the button as a) the user may not
+         # understand why it is disabled, and b) as we would then need to check
+         # the button state as the manager dialog closes.
+         if not self.manager.config.filter.enabled:
+             self.manager.ReportError(
+                 "You must enable SpamBayes before you can delete as spam")
+             return
          win32ui.DoWaitCursor(1)
          # Delete this item as spam.
***************
*** 413,416 ****
--- 421,432 ----
          msgstore_messages = self.explorer.GetSelectedMessages(True)
          if not msgstore_messages:
+             return
+         # If we are not yet enabled, tell the user.
+         # (This is better than disabling the button as a) the user may not
+         # understand why it is disabled, and b) as we would then need to check
+         # the button state as the manager dialog closes.
+         if not self.manager.config.filter.enabled:
+             self.manager.ReportError(
+                 "You must enable SpamBayes before you can recover spam")
              return
          win32ui.DoWaitCursor(1)



From mhammond at users.sourceforge.net  Mon Jun 30 21:16:34 2003
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Mon Jun 30 23:16:36 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000/installer
	spambayes_addin.spec, 1.4, 1.5
Message-ID: <E19XBdC-0007uI-00@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	spambayes_addin.spec 
Log Message:
Version 3 of the binary.


Index: spambayes_addin.spec
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/installer/spambayes_addin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** spambayes_addin.spec	1 May 2003 10:55:05 -0000	1.4
--- spambayes_addin.spec	1 Jul 2003 03:16:32 -0000	1.5
***************
*** 28,36 ****
  extras.append( ("default_bayes_customize.ini", join(PROJECT_ROOT, "default_bayes_customize.ini"), 'DATA') )
  
! excludes = ['timer', 'dde', 'win32help', 'spambayes.compatsets', 'pywin.dialogs']
  
! a = Analysis([INSTALLER_ROOT+'/support/_mountzlib.py',
!               INSTALLER_ROOT+'/support/useUnicode.py',
!               'spambayes_addin.py'],
               excludes = excludes, 
               pathex=[PROJECT_ROOT,os.path.join(PROJECT_ROOT, '..')])
--- 28,39 ----
  extras.append( ("default_bayes_customize.ini", join(PROJECT_ROOT, "default_bayes_customize.ini"), 'DATA') )
  
! excludes = ['dde', 'win32help']
  
! mods = []
! mods += [INSTALLER_ROOT+'/support/_mountzlib.py']
! mods += [INSTALLER_ROOT+'/support/useUnicode.py']
! mods.append('spambayes_addin.py')
! 
! a = Analysis(mods,
               excludes = excludes, 
               pathex=[PROJECT_ROOT,os.path.join(PROJECT_ROOT, '..')])