[Spambayes-checkins] spambayes/Outlook2000 msgstore.py,1.42,1.43

[Mark Hammond]

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

Modified Files:
	msgstore.py 
Log Message:
Give a less severe warning for "folder temporarily unavailable"


Index: msgstore.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/msgstore.py,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** msgstore.py	12 May 2003 23:26:35 -0000	1.42
--- msgstore.py	15 May 2003 00:36:52 -0000	1.43
***************
*** 96,103 ****
--- 96,110 ----
  USE_DEFERRED_ERRORS = mapi.MAPI_DEFERRED_ERRORS # or set to zero to see what changes <wink>
  
+ # Does this exception probably mean "object not found"?
  def IsNotFoundCOMException(exc_val):
      hr, msg, exc, arg_err = exc_val
      return hr in [mapi.MAPI_E_OBJECT_DELETED, mapi.MAPI_E_NOT_FOUND]
  
+ # Does this exception probably mean "object not available 'cos you ain't logged
+ # in, or 'cos the server is down"?
+ def IsNotAvailableCOMException(exc_val):
+     hr, msg, exc, arg_err = exc_val
+     return hr == mapi.MAPI_E_FAILONEPROVIDER
+ 
  def GetCOMExceptionString(exc_val):
      hr, msg, exc, arg_err = exc_val
***************
*** 224,229 ****
              except pythoncom.com_error, details:
                  # We will ignore *all* such errors for the time
!                 # being, but warn for results we don't know about.
!                 if not IsNotFoundCOMException(details):
                      print "WARNING: Unexpected MAPI error opening folder"
                      print GetCOMExceptionString(details)
--- 231,241 ----
              except pythoncom.com_error, details:
                  # We will ignore *all* such errors for the time
!                 # being, but give verbose details for results we don't
!                 # know about
!                 if IsNotAvailableCOMException(details):
!                     print "NOTE: Skipping folder for this session - temporarily unavailable"
!                 elif IsNotFoundCOMException(details):
!                     print "NOTE: Skipping deleted folder"
!                 else:
                      print "WARNING: Unexpected MAPI error opening folder"
                      print GetCOMExceptionString(details)