[pywin32-checkins] pywin32/com/win32comext/mapi emsabtags.py, 1.2, 1.2.4.1 mapiutil.py, 1.5.4.3, 1.5.4.4

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/com/win32comext/mapi
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29773/com/win32comext/mapi

Modified Files:
      Tag: py3k
	emsabtags.py mapiutil.py 
Log Message:
merge more .py changes from the trunk (via 2to3)

Index: emsabtags.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/mapi/emsabtags.py,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -d -r1.2 -r1.2.4.1
*** emsabtags.py	2 Jul 2003 03:40:37 -0000	1.2
--- emsabtags.py	11 Dec 2008 05:45:21 -0000	1.2.4.1
***************
*** 1,4 ****
  # Converted "manually" from EMSABTAG.H
! from mapitags import PT_UNSPECIFIED, PT_NULL, PT_I2, PT_LONG, PT_R4, \
                       PT_DOUBLE, PT_CURRENCY, PT_APPTIME, PT_ERROR, \
                       PT_BOOLEAN, PT_OBJECT, PT_I8, PT_STRING8, PT_UNICODE, \
--- 1,4 ----
  # Converted "manually" from EMSABTAG.H
! from .mapitags import PT_UNSPECIFIED, PT_NULL, PT_I2, PT_LONG, PT_R4, \
                       PT_DOUBLE, PT_CURRENCY, PT_APPTIME, PT_ERROR, \
                       PT_BOOLEAN, PT_OBJECT, PT_I8, PT_STRING8, PT_UNICODE, \

Index: mapiutil.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/mapi/mapiutil.py,v
retrieving revision 1.5.4.3
retrieving revision 1.5.4.4
diff -C2 -d -r1.5.4.3 -r1.5.4.4
*** mapiutil.py	27 Nov 2008 04:58:41 -0000	1.5.4.3
--- mapiutil.py	11 Dec 2008 05:45:21 -0000	1.5.4.4
***************
*** 4,9 ****
  ListType=list
  IntType=int
! StringType=str
! from pywintypes import UnicodeType, TimeType
  import pythoncom
  import mapi, mapitags
--- 4,8 ----
  ListType=list
  IntType=int
! from pywintypes import TimeType
  import pythoncom
  import mapi, mapitags
***************
*** 29,33 ****
  		# god-damn bullshit hex() warnings: I don't see a way to get the
  		# old behaviour without a warning!!
! 		ret = hex(long(pt))
  		# -0x8000000L -> 0x80000000
  		if ret[0]=='-': ret = ret[1:]
--- 28,32 ----
  		# god-damn bullshit hex() warnings: I don't see a way to get the
  		# old behaviour without a warning!!
! 		ret = hex(int(pt))
  		# -0x8000000L -> 0x80000000
  		if ret[0]=='-': ret = ret[1:]
***************
*** 83,87 ****
  		return None
  	if bRetList:
! 		return map( lambda v: v[1], data )
  	else:
  		return data[0][1]
--- 82,86 ----
  		return None
  	if bRetList:
! 		return [v[1] for v in data]
  	else:
  		return data[0][1]
***************
*** 143,147 ****
  	# First pass over the properties we should get IDs for.
  	for key, val in propDict.items():
! 		if type(key) in [StringType, UnicodeType]:
  			newProps.append((mapi.PS_PUBLIC_STRINGS, key))
  	# Query for the new IDs
--- 142,146 ----
  	# First pass over the properties we should get IDs for.
  	for key, val in propDict.items():
! 		if type(key) in [str, str]:
  			newProps.append((mapi.PS_PUBLIC_STRINGS, key))
  	# Query for the new IDs
***************
*** 150,156 ****
  	newProps = []
  	for key, val in propDict.items():
! 		if type(key) in [StringType, UnicodeType]:
  			type_val=type(val)
! 			if type_val in [StringType, pywintypes.UnicodeType]:
  				tagType = mapitags.PT_UNICODE
  			elif type_val==IntType:
--- 149,155 ----
  	newProps = []
  	for key, val in propDict.items():
! 		if type(key) in [str, str]:
  			type_val=type(val)
! 			if type_val in [str, str]:
  				tagType = mapitags.PT_UNICODE
  			elif type_val==IntType: