[Python-checkins] distutils2 (merge default -> default): merged from upstream

[tarek.ziade]

http://hg.python.org/distutils2/rev/932b3cea4285
changeset:   1304:932b3cea4285
parent:      1303:05f0910881fa
parent:      1302:09e86884295c
user:        Tarek Ziade <tarek at ziade.org>
date:        Tue Mar 13 17:01:28 2012 -0700
summary:
  merged from upstream

files:
  distutils2/compiler/msvc9compiler.py |  6 +++++-
  1 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/distutils2/compiler/msvc9compiler.py b/distutils2/compiler/msvc9compiler.py
--- a/distutils2/compiler/msvc9compiler.py
+++ b/distutils2/compiler/msvc9compiler.py
@@ -20,7 +20,11 @@
 from distutils2 import logger
 from distutils2.util import get_platform
 
-import winreg
+try:
+    import winreg
+except ImportError:
+    # Python 2 compatibility
+    import _winreg as winreg
 
 RegOpenKeyEx = winreg.OpenKeyEx
 RegEnumKey = winreg.EnumKey

-- 
Repository URL: http://hg.python.org/distutils2