[Spambayes-checkins] spambayes/Outlook2000 msgstore.py,1.68,1.69

[Mark Hammond]

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

Modified Files:
	msgstore.py 
Log Message:
Don't bother getting PR_HAS_ATTACH as we don't use it, and fix
bad function call detected by pychecker.


Index: msgstore.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/msgstore.py,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** msgstore.py	26 Aug 2003 08:02:59 -0000	1.68
--- msgstore.py	27 Aug 2003 12:10:48 -0000	1.69
***************
*** 710,720 ****
          prop_ids = (PR_BODY_A,
                      MYPR_BODY_HTML_A,
-                     PR_HASATTACH,
                      PR_TRANSPORT_MESSAGE_HEADERS_A)
          hr, data = self.mapi_object.GetProps(prop_ids,0)
          body = self._GetPotentiallyLargeStringProp(prop_ids[0], data[0])
          html = self._GetPotentiallyLargeStringProp(prop_ids[1], data[1])
!         has_attach = data[2][1]
!         headers = self._GetPotentiallyLargeStringProp(prop_ids[3], data[3])
  
          # Some Outlooks deliver a strange notion of headers, including
--- 710,718 ----
          prop_ids = (PR_BODY_A,
                      MYPR_BODY_HTML_A,
                      PR_TRANSPORT_MESSAGE_HEADERS_A)
          hr, data = self.mapi_object.GetProps(prop_ids,0)
          body = self._GetPotentiallyLargeStringProp(prop_ids[0], data[0])
          html = self._GetPotentiallyLargeStringProp(prop_ids[1], data[1])
!         headers = self._GetPotentiallyLargeStringProp(prop_ids[2], data[2])
  
          # Some Outlooks deliver a strange notion of headers, including
***************
*** 947,951 ****
                  if val == mapi.MAPI_E_NOT_ENOUGH_MEMORY:
                      # Too big for simple properties - get via a stream
!                     return self._GetPropFromStream(prop)
                  return None
              return val
--- 945,949 ----
                  if val == mapi.MAPI_E_NOT_ENOUGH_MEMORY:
                      # Too big for simple properties - get via a stream
!                     return GetPropFromStream(self.mapi_object, prop)
                  return None
              return val