[Spambayes-checkins] spambayes/Outlook2000 addin.py, 1.103, 1.104 manager.py, 1.81, 1.82

[Mark Hammond]

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

Modified Files:
	addin.py manager.py 
Log Message:
Couple of bugs found by pychecker!


Index: addin.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/addin.py,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** addin.py	27 Aug 2003 08:59:07 -0000	1.103
--- addin.py	27 Aug 2003 11:28:04 -0000	1.104
***************
*** 632,635 ****
--- 632,636 ----
              # that the source folder == dest folder - restore to
              # the inbox in this case.
+             subject = msgstore_message.GetSubject()
              restore_folder = msgstore_message.GetRememberedFolder()
              if restore_folder is None or \
***************
*** 639,643 ****
  
              # Must train before moving, else we lose the message!
-             subject = msgstore_message.GetSubject()
              print "Recovering to folder '%s' and ham training message '%s' - " % (restore_folder.name, subject),
              TrainAsHam(msgstore_message, self.manager)
--- 640,643 ----
***************
*** 692,696 ****
      def SetupUI(self):
          manager = self.manager
-         activeExplorer = self
          assert self.toolbar is None, "Should not yet have a toolbar"
  
--- 692,695 ----

Index: manager.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/manager.py,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** manager.py	26 Aug 2003 02:35:45 -0000	1.81
--- manager.py	27 Aug 2003 11:28:04 -0000	1.82
***************
*** 50,54 ****
      _DoMessage(message, title, win32con.MB_ICONEXCLAMATION)
  
! def ReportInformtation(message, title = None):
      if title is None: title = "SpamBayes"
      _DoMessage(message, title, win32con.MB_ICONINFORMATION)
--- 50,54 ----
      _DoMessage(message, title, win32con.MB_ICONEXCLAMATION)
  
! def ReportInformation(message, title = None):
      if title is None: title = "SpamBayes"
      _DoMessage(message, title, win32con.MB_ICONINFORMATION)