From: Georg Brandl <georg@python.org>
Date: Tue, 7 Apr 2009 21:27:29 +0000 (+0000)
Subject: Revert 3k change to msilib, which is executed with Python 2.x.
X-Git-Tag: v3.1b1~348
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fdb12a3facd63f8df33dc74cd86a48c7aeb5e9ca;p=python

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

diff --git a/Tools/msi/msilib.py b/Tools/msi/msilib.py
index 23a40a0248..6f49b4cf8c 100644
--- a/Tools/msi/msilib.py
+++ b/Tools/msi/msilib.py
@@ -5,7 +5,7 @@ import win32com.client.gencache
 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 @@ class CAB:
                      (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")