pywin32-checkins

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

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

Modified Files:
      Tag: py3k
	CHANGES.txt pywin32_postinstall.py setup.py 
Log Message:
merge lots of changes (most via 2to3) from the trunk

Index: pywin32_postinstall.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/pywin32_postinstall.py,v
retrieving revision 1.25.2.4
retrieving revision 1.25.2.5
diff -C2 -d -r1.25.2.4 -r1.25.2.5
*** pywin32_postinstall.py	6 Dec 2008 01:48:26 -0000	1.25.2.4
--- pywin32_postinstall.py	5 Jan 2009 12:51:26 -0000	1.25.2.5
***************
*** 4,8 ****
  # and creates a pth file
  import os, sys, glob, shutil, time
! import winreg
  
  # Send output somewhere so it can be found if necessary...
--- 4,8 ----
  # and creates a pth file
  import os, sys, glob, shutil, time
! import winreg as winreg
  
  # Send output somewhere so it can be found if necessary...

Index: setup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup.py,v
retrieving revision 1.81.2.12
retrieving revision 1.81.2.13
diff -C2 -d -r1.81.2.12 -r1.81.2.13
*** setup.py	28 Dec 2008 10:51:53 -0000	1.81.2.12
--- setup.py	5 Jan 2009 12:51:26 -0000	1.81.2.13
***************
*** 1,3 ****
! build_id="212.5" # may optionally include a ".{patchno}" suffix.
  # Putting buildno at the top prevents automatic __doc__ assignment, and
  # I *want* the build number at the top :)
--- 1,3 ----
! build_id="212.6" # may optionally include a ".{patchno}" suffix.
  # Putting buildno at the top prevents automatic __doc__ assignment, and
  # I *want* the build number at the top :)
***************
*** 76,82 ****
  # using the 'imports' fixer and therefore start much faster...
  if is_py3k:
!     import winreg as _winreg
  else:
!     import _winreg
  
  # The rest of our imports.
--- 76,82 ----
  # using the 'imports' fixer and therefore start much faster...
  if is_py3k:
!     import winreg as winreg
  else:
!     import winreg
  
  # The rest of our imports.
***************
*** 148,152 ****
      # landmark.
      DEBUG = False # can't use log.debug - not setup yet
-     HKLM = _winreg.HKEY_LOCAL_MACHINE # ack - 2to3 error - see http://bugs.python.org/issue3994
      landmark = "include\\windows.h"
      # 1. The use might have their current environment setup for the
--- 148,151 ----
***************
*** 163,169 ****
      #    the "Platform SDK for Windows Server 2003 SP1" this is dead end.
      try:
!         key = _winreg.OpenKey(HKLM,
                                r"Software\Microsoft\MicrosoftSDK\Directories")
!         sdkdir, ignore = _winreg.QueryValueEx(key, "Install Dir")
      except EnvironmentError:
          pass
--- 162,168 ----
      #    the "Platform SDK for Windows Server 2003 SP1" this is dead end.
      try:
!         key = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE,
                                r"Software\Microsoft\MicrosoftSDK\Directories")
!         sdkdir, ignore = winreg.QueryValueEx(key, "Install Dir")
      except EnvironmentError:
          pass
***************
*** 179,190 ****
      #    only one with an "Install Dir" sub-value.
      try:
!         key = _winreg.OpenKey(HKLM,
                                r"Software\Microsoft\MicrosoftSDK\InstalledSDKs")
          i = 0
          while True:
!             guid = _winreg.EnumKey(key, i)
!             guidkey = _winreg.OpenKey(key, guid)
              try:
!                 sdkdir, ignore = _winreg.QueryValueEx(guidkey, "Install Dir")
              except EnvironmentError:
                  pass
--- 178,189 ----
      #    only one with an "Install Dir" sub-value.
      try:
!         key = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE,
                                r"Software\Microsoft\MicrosoftSDK\InstalledSDKs")
          i = 0
          while True:
!             guid = winreg.EnumKey(key, i)
!             guidkey = winreg.OpenKey(key, guid)
              try:
!                 sdkdir, ignore = winreg.QueryValueEx(guidkey, "Install Dir")
              except EnvironmentError:
                  pass
***************
*** 201,207 ****
      # 4.  Vista's SDK
      try:
!         key = _winreg.OpenKey(HKLM,
                                r"Software\Microsoft\Microsoft SDKs\Windows")
!         sdkdir, ignore = _winreg.QueryValueEx(key, "CurrentInstallFolder")
      except EnvironmentError:
          pass
--- 200,206 ----
      # 4.  Vista's SDK
      try:
!         key = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE,
                                r"Software\Microsoft\Microsoft SDKs\Windows")
!         sdkdir, ignore = winreg.QueryValueEx(key, "CurrentInstallFolder")
      except EnvironmentError:
          pass
***************
*** 476,484 ****
          libs = kw.get("libraries", "")
          keyname = "SOFTWARE\Microsoft\Exchange\SDK"
!         for root in _winreg.HKEY_LOCAL_MACHINE, _winreg.HKEY_CURRENT_USER:
              try:
!                 keyob = _winreg.OpenKey(root, keyname)
!                 value, type_id = _winreg.QueryValueEx(keyob, "INSTALLDIR")
!                 if type_id == _winreg.REG_SZ:
                      sdk_install_dir = value
                      break
--- 475,483 ----
          libs = kw.get("libraries", "")
          keyname = "SOFTWARE\Microsoft\Exchange\SDK"
!         for root in winreg.HKEY_LOCAL_MACHINE, winreg.HKEY_CURRENT_USER:
              try:
!                 keyob = winreg.OpenKey(root, keyname)
!                 value, type_id = winreg.QueryValueEx(keyob, "INSTALLDIR")
!                 if type_id == winreg.REG_SZ:
                      sdk_install_dir = value
                      break
***************
*** 908,912 ****
                  # On a 64bit host, the value we are looking for is actually in
                  # SysWow64Node - but that is only available on xp and later.
!                 access = _winreg.KEY_READ
                  if sys.getwindowsversion()[0] >= 5:
                      access = access | 512 # KEY_WOW64_32KEY
--- 907,911 ----
                  # On a 64bit host, the value we are looking for is actually in
                  # SysWow64Node - but that is only available on xp and later.
!                 access = winreg.KEY_READ
                  if sys.getwindowsversion()[0] >= 5:
                      access = access | 512 # KEY_WOW64_32KEY
***************
*** 916,924 ****
                      plat_dir = "x86"
                  # Find the redist directory.
!                 HKLM = _winreg.HKEY_LOCAL_MACHINE
!                 vckey = _winreg.OpenKey(HKLM,
                                          r"SOFTWARE\Microsoft\VisualStudio\9.0\Setup\VC",
                                          0, access)
!                 val, val_typ = _winreg.QueryValueEx(vckey, "ProductDir")
                  mfc_dir = os.path.join(val, "redist", plat_dir, "Microsoft.VC90.MFC")
                  if not os.path.isdir(mfc_dir):
--- 915,922 ----
                      plat_dir = "x86"
                  # Find the redist directory.
!                 vckey = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE,
                                          r"SOFTWARE\Microsoft\VisualStudio\9.0\Setup\VC",
                                          0, access)
!                 val, val_typ = winreg.QueryValueEx(vckey, "ProductDir")
                  mfc_dir = os.path.join(val, "redist", plat_dir, "Microsoft.VC90.MFC")
                  if not os.path.isdir(mfc_dir):
***************
*** 1191,1194 ****
--- 1189,1196 ----
              swig_cmd.append("-dnone",) # we never use the .doc files.
              swig_cmd.extend(self.current_extension.extra_swig_commands)
+             if is_py3k:
+                 swig_cmd.append("-DSWIG_PY3K")
+             else:
+                 swig_cmd.append("-DSWIG_PY2K")
              target = swig_targets[source]
              try:
***************
*** 1241,1245 ****
          # process so the child will wait for us.
          # XXX - hmm - a closer look at distutils shows it only uses win32api
!         # if winreg fails - and this never should.  Need to revisit this!
          # If self.root has a value, it means we are being "installed" into
          # some other directory than Python itself (eg, into a temp directory
--- 1243,1247 ----
          # process so the child will wait for us.
          # XXX - hmm - a closer look at distutils shows it only uses win32api
!         # if _winreg fails - and this never should.  Need to revisit this!
          # If self.root has a value, it means we are being "installed" into
          # some other directory than Python itself (eg, into a temp directory
***************
*** 1309,1313 ****
              new_compiler = msvccompiler.MSVCCompiler()
              msvccompiler.get_build_version = gbv
!             for key in save_env.keys():
                  os.environ[key] = save_env[key]
  
--- 1311,1315 ----
              new_compiler = msvccompiler.MSVCCompiler()
              msvccompiler.get_build_version = gbv
!             for key in list(save_env.keys()):
                  os.environ[key] = save_env[key]
  
***************
*** 1342,1346 ****
                  args.append(stamp_script)
                  args.append("--version=%s" % (pywin32_version,))
-                 args.append("--description=Python extension module")
                  args.append("--comments=http://pywin32.sourceforge.net")
                  args.append("--original-filename=%s" % (os.path.basename(output_filename),))
--- 1344,1347 ----
***************
*** 1367,1371 ****
              build_order = ".i .mc .rc .cpp".split()
              decorated = [(build_order.index(ext.lower()), obj, (src, ext))
!                          for obj, (src, ext) in build.items()]
              decorated.sort()
              items = [item[1:] for item in decorated]
--- 1368,1372 ----
              build_order = ".i .mc .rc .cpp".split()
              decorated = [(build_order.index(ext.lower()), obj, (src, ext))
!                          for obj, (src, ext) in list(build.items())]
              decorated.sort()
              items = [item[1:] for item in decorated]
***************
*** 1444,1448 ****
                """),
          ("win32pdh", "", None),
!         ("win32pipe", "", True, None, 'win32/src/win32pipe.i'),
          ("win32print", "winspool user32 gdi32", None, 0x0500),
          ("win32process", "advapi32 user32", None, 0x0500),
--- 1445,1449 ----
                """),
          ("win32pdh", "", None),
!         ("win32pipe", "", None, None, 'win32/src/win32pipe.i win32/src/win32popen.cpp'),
          ("win32print", "winspool user32 gdi32", None, 0x0500),
          ("win32process", "advapi32 user32", None, 0x0500),
***************
*** 1596,1605 ****
      # ActiveDebugging is a mess.  See the comments in the docstring of this
      # module for details on getting it built.
! ##    WinExt_win32com('axdebug',
! ##            dsp_file=r"com\Active Debugging.dsp",
! ##            libraries="axscript",
! ##            pch_header = "stdafx.h",
! ##            optional_headers = ["activdbg.h"],
! ##    ),
      WinExt_win32com('internet'),
      WinExt_win32com('mapi', libraries="mapi32", pch_header="PythonCOM.h",
--- 1597,1606 ----
      # ActiveDebugging is a mess.  See the comments in the docstring of this
      # module for details on getting it built.
!     WinExt_win32com('axdebug',
!             dsp_file=r"com\Active Debugging.dsp",
!             libraries="axscript",
!             pch_header = "stdafx.h",
!             optional_headers = ["activdbg.h"],
!     ),
      WinExt_win32com('internet'),
      WinExt_win32com('mapi', libraries="mapi32", pch_header="PythonCOM.h",

Index: CHANGES.txt
===================================================================
RCS file: /cvsroot/pywin32/pywin32/CHANGES.txt,v
retrieving revision 1.26.2.7
retrieving revision 1.26.2.8
diff -C2 -d -r1.26.2.7 -r1.26.2.8
*** CHANGES.txt	11 Dec 2008 05:45:21 -0000	1.26.2.7
--- CHANGES.txt	5 Jan 2009 12:51:26 -0000	1.26.2.8
***************
*** 9,12 ****
--- 9,23 ----
  ----------------
  
+ * Added win32wnet.WNetAddConnection3 allowing a HWND to be specified for
+   authentication.
+ 
+ * isapi:
+   * Refactored isapi.install primarily to support installing extensions into 
+     the root of a site (Jason R. Coombs)
+   * New IIS6-only functionality HSE_REQ_EXEC_URL which avoids the need to use
+     a filter in most cases, including new demos for this.
+   * Other misc support functions (HSE_REQ_REPORT_UNHEALTHY, 
+     HSE_REQ_GET_ANONYMOUS_TOKEN, etc)
+ 
  * "Modernization" changes, instigated by py3k:
  
***************
*** 63,67 ****
  * win32com.shell gets support for IContextMenu2 and IContextMenu3
  
! * add win32api.GetNativeSystemInfo()
  
  Since build 211:
--- 74,78 ----
  * win32com.shell gets support for IContextMenu2 and IContextMenu3
  
! * add win32api.GetNativeSystemInfo(), win32api.GetKeyboardLayout()
  
  Since build 211: