[pywin32-checkins] pywin32 CHANGES.txt, 1.26.2.9, 1.26.2.10 setup.py, 1.81.2.16, 1.81.2.17

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

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

Modified Files:
      Tag: py3k
	CHANGES.txt setup.py 
Log Message:
merge various trunk changes

Index: setup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup.py,v
retrieving revision 1.81.2.16
retrieving revision 1.81.2.17
diff -C2 -d -r1.81.2.16 -r1.81.2.17
*** setup.py	27 Jan 2009 07:56:44 -0000	1.81.2.16
--- setup.py	28 Jan 2009 11:29:52 -0000	1.81.2.17
***************
*** 693,708 ****
          # directx sdk sucks - how to locate it automatically?
          # Must manually set DIRECTX_SDK_DIR for now.
!         dxsdk_dir = os.environ.get("DIRECTX_SDK_DIR")
!         if dxsdk_dir:
!             extra = os.path.join(dxsdk_dir, 'include')
!             assert os.path.isdir(extra), "%s doesn't exist!" % (extra,)
!             self.compiler.add_include_dir(extra)
!             if is_64bit:
!                 tail = 'x64'
!             else:
!                 tail = 'x86'
!             extra = os.path.join(dxsdk_dir, 'lib', tail)
!             assert os.path.isdir(extra), "%s doesn't exist!" % (extra,)
!             self.compiler.add_library_dir(extra)
  
          log.debug("After SDK processing, includes are %s", self.compiler.include_dirs)
--- 693,712 ----
          # directx sdk sucks - how to locate it automatically?
          # Must manually set DIRECTX_SDK_DIR for now.
!         # (but it appears November 2008 and later versions set DXSDK_DIR, so
!         # we allow both, allowing our "old" DIRECTX_SDK_DIR to override things
!         for dxsdk_dir_var in ("DIRECTX_SDK_DIR", "DXSDK_DIR"):
!             dxsdk_dir = os.environ.get(dxsdk_dir_var)
!             if dxsdk_dir:
!                 extra = os.path.join(dxsdk_dir, 'include')
!                 assert os.path.isdir(extra), "%s doesn't exist!" % (extra,)
!                 self.compiler.add_include_dir(extra)
!                 if is_64bit:
!                     tail = 'x64'
!                 else:
!                     tail = 'x86'
!                 extra = os.path.join(dxsdk_dir, 'lib', tail)
!                 assert os.path.isdir(extra), "%s doesn't exist!" % (extra,)
!                 self.compiler.add_library_dir(extra)
!                 break
  
          log.debug("After SDK processing, includes are %s", self.compiler.include_dirs)

Index: CHANGES.txt
===================================================================
RCS file: /cvsroot/pywin32/pywin32/CHANGES.txt,v
retrieving revision 1.26.2.9
retrieving revision 1.26.2.10
diff -C2 -d -r1.26.2.9 -r1.26.2.10
*** CHANGES.txt	27 Jan 2009 07:56:44 -0000	1.26.2.9
--- CHANGES.txt	28 Jan 2009 11:29:52 -0000	1.26.2.10
***************
*** 9,12 ****
--- 9,25 ----
  ----------------
  
+ * py3k work - see the notes in the main documentation index for details,
+   but this entailed a huge overhaul of almost all the pywin32 sources.
+   Many things have been modernized for the first time in over a decade,
+   and may new tests have been added.  As a result, build 213 will not
+   be recommended for production work and should be treated as beta quality.
+ 
+   Huge thanks to:
+   - Roger Upole: for starting the py3k work, and without whom the py3k work
+     would literally not yet have started.
+   - Jason R. Coombs: for help porting win32timezone to py3k and for helping
+     with the new datetime object support.
+   - Vernon Cole: for help with porting adodbapi to py3k.
+ 
  * Added win32wnet.WNetAddConnection3 allowing a HWND to be specified for
    authentication.