From 11c9d251ef12b8f8fdd787d0d053d292c2787ae8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tarek=20Ziad=C3=A9?= Date: Wed, 18 Nov 2009 09:32:34 +0000 Subject: [PATCH] Merged revisions 76358 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76358 | tarek.ziade | 2009-11-18 09:46:56 +0100 (Wed, 18 Nov 2009) | 1 line #7293: distutils.test_msvc9compiler now uses a key that exists on any fresh windows install ........ --- Lib/distutils/tests/test_msvc9compiler.py | 10 +++++----- Misc/NEWS | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Lib/distutils/tests/test_msvc9compiler.py b/Lib/distutils/tests/test_msvc9compiler.py index 73827988bb..7cf1a12ec7 100644 --- a/Lib/distutils/tests/test_msvc9compiler.py +++ b/Lib/distutils/tests/test_msvc9compiler.py @@ -44,17 +44,17 @@ class msvc9compilerTestCase(unittest.TestCase): # looking for values that should exist on all # windows registeries versions. - path = r'Software\Microsoft\Notepad' - v = Reg.get_value(path, "lfitalic") - self.assertTrue(v in (0, 1)) + path = r'Control Panel\Desktop' + v = Reg.get_value(path, 'dragfullwindows') + self.assertTrue(v in ('0', '1')) import winreg HKCU = winreg.HKEY_CURRENT_USER keys = Reg.read_keys(HKCU, 'xxxx') self.assertEquals(keys, None) - keys = Reg.read_keys(HKCU, r'Software\Microsoft') - self.assertTrue('Notepad' in keys) + keys = Reg.read_keys(HKCU, r'Control Panel') + self.assertTrue('Desktop' in keys) def test_suite(): return unittest.makeSuite(msvc9compilerTestCase) diff --git a/Misc/NEWS b/Misc/NEWS index cc134d686b..2e3dee3e09 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -137,6 +137,9 @@ C-API Library ------- +- Issue #7293: distutils.test_msvc9compiler is fixed to work on any fresh + Windows box. Help provided by David Bolen. + - Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using TLS or SSL. Patch by Giampaolo Rodola'. -- 2.40.0