Fixed my simplification to Thomas' patch: winreg and win32api export the same

functions, but with different names.
This commit is contained in:
Greg Ward 2000-03-31 19:04:25 +00:00
parent ddc6c276b7
commit 19ce16665d
1 changed files with 13 additions and 8 deletions

View File

@ -21,15 +21,25 @@ _can_read_reg = 0
try: try:
import winreg import winreg
_can_read_reg = 1 _can_read_reg = 1
hkey_mod = winreg # module that provides HKEY_* stuff hkey_mod = winreg
reg_mod = winreg # provides other registry stuff
RegOpenKeyEx = winreg.OpenKeyEx
RegEnumKey = winreg.EnumKey
RegEnumValue = winreg.EnumValue
RegError = winreg.error
except ImportError: except ImportError:
try: try:
import win32api import win32api
import win32con import win32con
_can_read_reg = 1 _can_read_reg = 1
hkey_mod = win32con hkey_mod = win32con
reg_mod = win32api
RegOpenKeyEx = win32api.RegOpenKeyEx
RegEnumKey = win32api.RegEnumKey
RegEnumValue = win32api.RegEnumValue
RegError = win32api.error
except ImportError: except ImportError:
pass pass
@ -38,11 +48,6 @@ if _can_read_reg:
HKEY_LOCAL_MACHINE = hkey_mod.HKEY_LOCAL_MACHINE HKEY_LOCAL_MACHINE = hkey_mod.HKEY_LOCAL_MACHINE
HKEY_CURRENT_USER = hkey_mod.HKEY_CURRENT_USER HKEY_CURRENT_USER = hkey_mod.HKEY_CURRENT_USER
HKEY_USERS = hkey_mod.HKEY_USERS HKEY_USERS = hkey_mod.HKEY_USERS
RegOpenKeyEx = reg_mod.RegOpenKeyEx
RegEnumKey = reg_mod.RegEnumKey
RegEnumValue = reg_mod.RegEnumValue
RegError = reg_mod.error
_can_read_reg = 1