Commit fdb12a3f authored by Georg Brandl's avatar Georg Brandl

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

parent d99fe9fe
...@@ -5,7 +5,7 @@ import win32com.client.gencache ...@@ -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: ...@@ -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")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment