diff options
| author | Georg Brandl <georg@python.org> | 2008-05-25 07:45:51 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2008-05-25 07:45:51 (GMT) |
| commit | 38feaf0fef244879411f094a7e68f542a6771dea (patch) | |
| tree | 632d870bad650ece1724111091a2b307759ea997 /Lib/distutils | |
| parent | 2cb57a40b28f4680a1433d4640d99f4b2efe7165 (diff) | |
| download | cpython-38feaf0fef244879411f094a7e68f542a6771dea.zip cpython-38feaf0fef244879411f094a7e68f542a6771dea.tar.gz cpython-38feaf0fef244879411f094a7e68f542a6771dea.tar.bz2 | |
#2879: rename _winreg to winreg.
Diffstat (limited to 'Lib/distutils')
| -rw-r--r-- | Lib/distutils/msvc9compiler.py | 18 | ||||
| -rw-r--r-- | Lib/distutils/msvccompiler.py | 14 |
2 files changed, 16 insertions, 16 deletions
diff --git a/Lib/distutils/msvc9compiler.py b/Lib/distutils/msvc9compiler.py index c8d52c4..fdb74ae 100644 --- a/Lib/distutils/msvc9compiler.py +++ b/Lib/distutils/msvc9compiler.py @@ -24,17 +24,17 @@ from distutils.ccompiler import (CCompiler, gen_preprocess_options, from distutils import log from distutils.util import get_platform -import _winreg +import winreg -RegOpenKeyEx = _winreg.OpenKeyEx -RegEnumKey = _winreg.EnumKey -RegEnumValue = _winreg.EnumValue -RegError = _winreg.error +RegOpenKeyEx = winreg.OpenKeyEx +RegEnumKey = winreg.EnumKey +RegEnumValue = winreg.EnumValue +RegError = winreg.error -HKEYS = (_winreg.HKEY_USERS, - _winreg.HKEY_CURRENT_USER, - _winreg.HKEY_LOCAL_MACHINE, - _winreg.HKEY_CLASSES_ROOT) +HKEYS = (winreg.HKEY_USERS, + winreg.HKEY_CURRENT_USER, + winreg.HKEY_LOCAL_MACHINE, + winreg.HKEY_CLASSES_ROOT) VS_BASE = r"Software\Microsoft\VisualStudio\%0.1f" WINSDK_BASE = r"Software\Microsoft\Microsoft SDKs\Windows" diff --git a/Lib/distutils/msvccompiler.py b/Lib/distutils/msvccompiler.py index 71146dc..1cd0f91 100644 --- a/Lib/distutils/msvccompiler.py +++ b/Lib/distutils/msvccompiler.py @@ -20,15 +20,15 @@ from distutils import log _can_read_reg = False try: - import _winreg + import winreg _can_read_reg = True - hkey_mod = _winreg + hkey_mod = winreg - RegOpenKeyEx = _winreg.OpenKeyEx - RegEnumKey = _winreg.EnumKey - RegEnumValue = _winreg.EnumValue - RegError = _winreg.error + RegOpenKeyEx = winreg.OpenKeyEx + RegEnumKey = winreg.EnumKey + RegEnumValue = winreg.EnumValue + RegError = winreg.error except ImportError: try: @@ -44,7 +44,7 @@ except ImportError: except ImportError: log.info("Warning: Can't read registry to find the " "necessary compiler setting\n" - "Make sure that Python modules _winreg, " + "Make sure that Python modules winreg, " "win32api or win32con are installed.") pass |