mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 11:23:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

Browse source
This commit is contained in:
Georg Brandl 2009-04-07 21:27:29 +00:00
parent d99fe9fea7
commit fdb12a3fac
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Tools/msi/msilib.py
View file

@ -5,7 +5,7 @@ import win32com.client.gencache
import win32com.client import win32com.client
import pythoncom, pywintypes import pythoncom, pywintypes
from win32com.client import constants 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: try:
basestring basestring
@ -387,9 +387,9 @@ class CAB:
(r"Software\Microsoft\Win32SDK\Directories", "Install Dir"), (r"Software\Microsoft\Win32SDK\Directories", "Install Dir"),
]: ]:
try: try:
key = winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, k) key = _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, k)
dir = winreg.QueryValueEx(key, v)[0] dir = _winreg.QueryValueEx(key, v)[0]
winreg.CloseKey(key) _winreg.CloseKey(key)
except (WindowsError, IndexError): except (WindowsError, IndexError):
continue continue
cabarc = os.path.join(dir, r"Bin", "cabarc.exe") cabarc = os.path.join(dir, r"Bin", "cabarc.exe")