[Spambayes-checkins] spambayes/Outlook2000 msgstore.py,1.95,1.96

[Tony Meyer]

Update of /cvsroot/spambayes/spambayes/Outlook2000
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9230/Outlook2000

Modified Files:
	msgstore.py 
Log Message:
The version doesn't appear to be easily accessible in the message properties, so use
 a fixed one for the faked-up headers.

Index: msgstore.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/msgstore.py,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** msgstore.py	17 Dec 2004 01:37:04 -0000	1.95
--- msgstore.py	20 Dec 2004 04:23:33 -0000	1.96
***************
*** 30,34 ****
  MYPR_BODY_HTML_W = 0x1013001f # ditto
  MYPR_MESSAGE_ID_A = 0x1035001E # more magic (message id field used for Exchange)
- MYPR_VERSION_ID = 0x7E8FFFFD # magic that I think tells us the Outlook version
  
  CLEAR_READ_FLAG = 0x00000004
--- 30,33 ----
***************
*** 989,997 ****
          prop_ids = PR_SUBJECT_A, PR_SENDER_NAME_A, PR_DISPLAY_TO_A, \
                     PR_DISPLAY_CC_A, PR_MESSAGE_DELIVERY_TIME, \
!                    MYPR_MESSAGE_ID_A, PR_IMPORTANCE, PR_CLIENT_SUBMIT_TIME, \
! #       This property gives a 'The parameter is incorrect' error, for some
! #       reason, as does, 0x7E8EFFE2, which I think is the 'pretty' version
! #       number.  Until that's figured out, we'll have to not get this.
! #                   MYPR_VERSION_ID
          hr, data = self.mapi_object.GetProps(prop_ids, 0)
          headers = ["X-Exchange-Message: true"]
--- 988,992 ----
          prop_ids = PR_SUBJECT_A, PR_SENDER_NAME_A, PR_DISPLAY_TO_A, \
                     PR_DISPLAY_CC_A, PR_MESSAGE_DELIVERY_TIME, \
!                    MYPR_MESSAGE_ID_A, PR_IMPORTANCE, PR_CLIENT_SUBMIT_TIME,
          hr, data = self.mapi_object.GetProps(prop_ids, 0)
          headers = ["X-Exchange-Message: true"]
***************
*** 1005,1009 ****
              ("Importance", 6, False, self._format_importance),
              ("Date", 7, False, self._format_time),
! #            ("X-Mailer", 8, False, self._format_version),
              ):
              if potentially_large:
--- 1000,1004 ----
              ("Importance", 6, False, self._format_importance),
              ("Date", 7, False, self._format_time),
!             ("X-Mailer", 7, False, self._format_version),
              ):
              if potentially_large:
***************
*** 1033,1039 ****
          return {0 : "low", 1 : "normal", 2 : "high"}[raw]
  
!     def _format_version(self, raw):
!         # Data is just a version string, so prepend something to it.
!         return "Exchange Client " + raw
  
      _address_re = re.compile(r"[()<>,:@!/=; ]")
--- 1028,1033 ----
          return {0 : "low", 1 : "normal", 2 : "high"}[raw]
  
!     def _format_version(self, unused):
!         return "Microsoft Exchange Client"
  
      _address_re = re.compile(r"[()<>,:@!/=; ]")