summaryrefslogtreecommitdiffstats
path: root/Tools/msi/msilib.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-04-07 21:27:29 (GMT)
committerGeorg Brandl <georg@python.org>2009-04-07 21:27:29 (GMT)
commitfdb12a3facd63f8df33dc74cd86a48c7aeb5e9ca (patch)
tree904b985472b242099caa35eb56f3dd5b6a2cd22d /Tools/msi/msilib.py
parentd99fe9fea7c4a3b938ced878de1665ff60265025 (diff)
downloadcpython-fdb12a3facd63f8df33dc74cd86a48c7aeb5e9ca.zip
cpython-fdb12a3facd63f8df33dc74cd86a48c7aeb5e9ca.tar.gz
cpython-fdb12a3facd63f8df33dc74cd86a48c7aeb5e9ca.tar.bz2
Revert 3k change to msilib, which is executed with Python 2.x.
Diffstat (limited to 'Tools/msi/msilib.py')
-rw-r--r--Tools/msi/msilib.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/Tools/msi/msilib.py b/Tools/msi/msilib.py
index 23a40a0..6f49b4c 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")