[Python-checkins] r71379 - python/branches/py3k/Tools/msi/msilib.py

[georg.brandl]

Author: georg.brandl
Date: Tue Apr  7 23:27:29 2009
New Revision: 71379

Log:
Revert 3k change to msilib, which is executed with Python 2.x.

Modified:
   python/branches/py3k/Tools/msi/msilib.py

Modified: python/branches/py3k/Tools/msi/msilib.py
==============================================================================
--- python/branches/py3k/Tools/msi/msilib.py	(original)
+++ python/branches/py3k/Tools/msi/msilib.py	Tue Apr  7 23:27:29 2009
@@ -5,7 +5,7 @@
 import win32com.client
 import pythoncom, pywintypes
 from win32com.client import constants
-import re, string, os, sets, glob, subprocess, sys, winreg, struct
+import re, string, os, sets, glob, subprocess, sys, _winreg, struct
 
 try:
     basestring
@@ -387,9 +387,9 @@
                      (r"Software\Microsoft\Win32SDK\Directories", "Install Dir"),
                     ]:
             try:
-                key = winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, k)
-                dir = winreg.QueryValueEx(key, v)[0]
-                winreg.CloseKey(key)
+                key = _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, k)
+                dir = _winreg.QueryValueEx(key, v)[0]
+                _winreg.CloseKey(key)
             except (WindowsError, IndexError):
                 continue
             cabarc = os.path.join(dir, r"Bin", "cabarc.exe")