[pywin32-checkins] pywin32/com/win32com/client build.py, 1.31.2.7, 1.31.2.8 genpy.py, 1.55.2.8, 1.55.2.9

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

Update of /cvsroot/pywin32/pywin32/com/win32com/client
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4460/com/win32com/client

Modified Files:
      Tag: py3k
	build.py genpy.py 
Log Message:
merge lots of changes from the trunk

Index: genpy.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/genpy.py,v
retrieving revision 1.55.2.8
retrieving revision 1.55.2.9
diff -C2 -d -r1.55.2.8 -r1.55.2.9
*** genpy.py	5 Jan 2009 12:51:26 -0000	1.55.2.8
--- genpy.py	14 Jan 2009 12:42:02 -0000	1.55.2.9
***************
*** 205,211 ****
          val = vdesc[1]
          if sys.version_info <= (2,4) and (isinstance(val, int) or isinstance(val, int)):
!           if val==0x80000000-1+1: # special case for py2.3 (and avoid 'L' syntax for py3k)
              use = "0x80000000L" # 'L' for future warning
!           elif val > 0x80000000-1+1 or val < 0: # avoid a FutureWarning
              use = int(val)
            else:
--- 205,212 ----
          val = vdesc[1]
          if sys.version_info <= (2,4) and (isinstance(val, int) or isinstance(val, int)):
!           # in python 2.3, 0x80000000L == 2147483648
!           if val==2147483648: # == 0x80000000L - special case for 2.3...
              use = "0x80000000L" # 'L' for future warning
!           elif val > 2147483648 or val < 0: # avoid a FutureWarning
              use = int(val)
            else:
***************
*** 827,831 ****
      print('python_version = 0x%x' % (sys.hexversion,), file=self.file)
      print(file=self.file)
!     print('import win32com.client.CLSIDToClass, pythoncom', file=self.file)
      print('import win32com.client.util', file=self.file)
      print('from pywintypes import IID', file=self.file)
--- 828,832 ----
      print('python_version = 0x%x' % (sys.hexversion,), file=self.file)
      print(file=self.file)
!     print('import win32com.client.CLSIDToClass, pythoncom, pywintypes', file=self.file)
      print('import win32com.client.util', file=self.file)
      print('from pywintypes import IID', file=self.file)

Index: build.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/build.py,v
retrieving revision 1.31.2.7
retrieving revision 1.31.2.8
diff -C2 -d -r1.31.2.7 -r1.31.2.8
*** build.py	5 Jan 2009 12:51:26 -0000	1.31.2.7
--- build.py	14 Jan 2009 12:42:02 -0000	1.31.2.8
***************
*** 19,23 ****
  import sys
  import string
- 
  from keyword import iskeyword
  
--- 19,22 ----
***************
*** 560,564 ****
      if type(val) is TimeType:
        year=val.year; month=val.month; day=val.day; hour=val.hour; minute=val.minute; second=val.second; msec=val.msec
!       return "pythoncom.MakeTime((%(year)d, %(month)d, %(day)d, %(hour)d, %(minute)d, %(second)d,0,0,0,%(msec)d))" % locals()
      else:
        return repr(val)
--- 559,563 ----
      if type(val) is TimeType:
        year=val.year; month=val.month; day=val.day; hour=val.hour; minute=val.minute; second=val.second; msec=val.msec
!       return "pywintypes.Time((%(year)d, %(month)d, %(day)d, %(hour)d, %(minute)d, %(second)d,0,0,0,%(msec)d))" % locals()
      else:
        return repr(val)