From 37b2ffa08fe33514550a5d8ff7d08b792658cf29 Mon Sep 17 00:00:00 2001 From: ?ric Araujo Date: Wed, 14 Mar 2012 14:04:48 +0100 Subject: Fix winreg imports; we are not using a single codebase --- distutils2/compiler/msvc9compiler.py | 6 +----- distutils2/compiler/msvccompiler.py | 2 +- distutils2/tests/test_msvc9compiler.py | 5 +---- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/distutils2/compiler/msvc9compiler.py b/distutils2/compiler/msvc9compiler.py index 6effc25..438afdc 100644 --- a/distutils2/compiler/msvc9compiler.py +++ b/distutils2/compiler/msvc9compiler.py @@ -20,11 +20,7 @@ from distutils2.compiler import gen_lib_options from distutils2 import logger from distutils2.util import get_platform -try: - import winreg -except ImportError: - # Python 2 compatibility - import _winreg as winreg +import _winreg as winreg RegOpenKeyEx = winreg.OpenKeyEx RegEnumKey = winreg.EnumKey diff --git a/distutils2/compiler/msvccompiler.py b/distutils2/compiler/msvccompiler.py index 83211ee..0c71f61 100644 --- a/distutils2/compiler/msvccompiler.py +++ b/distutils2/compiler/msvccompiler.py @@ -19,7 +19,7 @@ from distutils2 import logger _can_read_reg = False try: - import winreg + import _winreg as winreg _can_read_reg = True hkey_mod = winreg diff --git a/distutils2/tests/test_msvc9compiler.py b/distutils2/tests/test_msvc9compiler.py index e7f3287..7485ff3 100644 --- a/distutils2/tests/test_msvc9compiler.py +++ b/distutils2/tests/test_msvc9compiler.py @@ -101,10 +101,7 @@ class msvc9compilerTestCase(support.TempdirManager, v = Reg.get_value(path, 'dragfullwindows') self.assertIn(v, ('0', '1', '2')) - try: - import winreg - except ImportError: - import _winreg as winreg + import _winreg as winreg HKCU = winreg.HKEY_CURRENT_USER keys = Reg.read_keys(HKCU, 'xxxx') self.assertEqual(keys, None) -- cgit v1.2.1