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
........
diff --git a/Lib/distutils/tests/test_msvc9compiler.py b/Lib/distutils/tests/test_msvc9compiler.py
index 7382798..7cf1a12 100644
--- a/Lib/distutils/tests/test_msvc9compiler.py
+++ b/Lib/distutils/tests/test_msvc9compiler.py
@@ -44,17 +44,17 @@
# 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 cc134d6..2e3dee3 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -137,6 +137,9 @@
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'.