Update of /cvsroot/pywin32/pywin32/com/win32comext/mapi
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8245/com/win32comext/mapi
Modified Files:
Tag: py3k
mapiutil.py
Log Message:
merge various py3k friendly changes from the trunk.
Index: mapiutil.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/mapi/mapiutil.py,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -C2 -d -r1.5 -r1.5.4.1
*** mapiutil.py 20 Jan 2004 01:24:08 -0000 1.5
--- mapiutil.py 23 Oct 2008 09:45:16 -0000 1.5.4.1
***************
*** 1,12 ****
# General utilities for MAPI and MAPI objects.
! from types import TupleType, ListType, IntType, StringType
from pywintypes import UnicodeType, TimeType
import pythoncom
import mapi, mapitags
- # Pre 2.2.1 compat.
- try: True, False
- except NameError: True = 1==1; False = 1==0
-
prTable = {}
def GetPropTagName(pt):
--- 1,12 ----
# General utilities for MAPI and MAPI objects.
! # We used to use these old names from the 'types' module...
! TupleType=tuple
! ListType=list
! IntType=int
! StringType=str
from pywintypes import UnicodeType, TimeType
import pythoncom
import mapi, mapitags
prTable = {}
def GetPropTagName(pt):
|
