diff options
| author | Tarek Ziade <tarek@ziade.org> | 2012-03-13 20:31:36 -0700 |
|---|---|---|
| committer | Tarek Ziade <tarek@ziade.org> | 2012-03-13 20:31:36 -0700 |
| commit | a2b5ba38c1dfcaef73f2cd7cb21d9f371a714992 (patch) | |
| tree | 0a91d38105500575f21524d0dddcf125725b3754 | |
| parent | 2b0067a46ae1ad4e8798ed5a86fbbe8e2b831341 (diff) | |
| parent | f18e520c14b9972335674e6ff37d58da708452df (diff) | |
| download | disutils2-a2b5ba38c1dfcaef73f2cd7cb21d9f371a714992.tar.gz | |
merged
| -rw-r--r-- | distutils2/command/bdist_msi.py | 2 | ||||
| -rw-r--r-- | 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 index f79bb41..3a85916 100644 --- 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 index 22e5cea..e7f3287 100644 --- a/distutils2/tests/test_msvc9compiler.py +++ b/distutils2/tests/test_msvc9compiler.py @@ -101,7 +101,10 @@ class msvc9compilerTestCase(support.TempdirManager, 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) |