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

[tarek.ziade]

http://hg.python.org/distutils2/rev/d5f57d07abe6
changeset:   1308:d5f57d07abe6
parent:      1307:f453054a7d8b
parent:      1306:d9a17cfd3f5c
user:        Tarek Ziade <tarek at ziade.org>
date:        Tue Mar 13 20:31:36 2012 -0700
summary:
  merged

files:
  distutils2/command/bdist_msi.py        |  2 ++
  distutils2/tests/test_msvc9compiler.py |  5 ++++-
  2 files changed, 6 insertions(+), 1 deletions(-)


diff --git a/distutils2/command/bdist_msi.py b/distutils2/command/bdist_msi.py
--- a/distutils2/command/bdist_msi.py
+++ b/distutils2/command/bdist_msi.py
@@ -1,3 +1,5 @@
+#-*- coding: utf-8 -*-
+
 """Create a Microsoft Installer (.msi) binary distribution."""
 
 # Copyright (C) 2005, 2006 Martin von Löwis
diff --git a/distutils2/tests/test_msvc9compiler.py b/distutils2/tests/test_msvc9compiler.py
--- a/distutils2/tests/test_msvc9compiler.py
+++ b/distutils2/tests/test_msvc9compiler.py
@@ -101,7 +101,10 @@
         v = Reg.get_value(path, 'dragfullwindows')
         self.assertIn(v, ('0', '1', '2'))
 
-        import winreg
+        try:
+            import winreg
+        except ImportError:
+            import _winreg as winreg
         HKCU = winreg.HKEY_CURRENT_USER
         keys = Reg.read_keys(HKCU, 'xxxx')
         self.assertEqual(keys, None)

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