[Spambayes-checkins] spambayes/Outlook2000 addin.py,1.120,1.121

[Mark Hammond]

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

Modified Files:
	addin.py 
Log Message:
Remove handling of E_OBJECT_CHANGED exception, as it simply did not work.


Index: addin.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/addin.py,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** addin.py	19 Dec 2003 04:40:26 -0000	1.120
--- addin.py	19 Dec 2003 06:27:58 -0000	1.121
***************
*** 365,389 ****
          if not self.use_timer or not item.UnRead:
              ms = self.manager.message_store
!             # The object can sometimes change underneath us (most noticably
!             # with hotmail, which presumably has greater 'synchronization'
!             # issues than tightly bound stores.  We accept this error exactly
!             # 2 times (once as we have seen it, and twice as it can't hurt ;)
!             for i in range(3):
!                 try:
!                     msgstore_message = ms.GetMessage(item)
!                     ProcessMessage(msgstore_message, self.manager)
!                     break
!                 except ms.ObjectChangedException:
!                     # try again.
!                     self.manager.LogDebug(1, "Got object changed error - trying again...")
!                     continue
!                 except ms.MsgStoreException, details:
!                     print "Unexpected error fetching message"
!                     traceback.print_exc()
!                     print details
!                     break
!             else:
!                 print "WARNING: Could not filter a message, as we got an " \
!                       "'object changed' exception 3 times!"
          else:
              self._StartTimer()
--- 365,370 ----
          if not self.use_timer or not item.UnRead:
              ms = self.manager.message_store
!             msgstore_message = ms.GetMessage(item)
!             ProcessMessage(msgstore_message, self.manager)
          else:
              self._StartTimer()