Merged revisions 76360 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76360 | tarek.ziade | 2009-11-18 10:32:34 +0100 (Wed, 18 Nov 2009) | 9 lines

  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 73827988bb2d9fed0ecb3105011db5430ed6265d..7cf1a12ec7a02d1902df370b5cb45c2ab20a17a7 100644 (file)
--- 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 2c1f5a79bd3d1717f3299a8b2a7ab6dffb62efcb..07122361fb5afa06f836de39f3331431fe8f478e 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -46,6 +46,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #7293: distutils.test_msvc9compiler is fixed to work on any fresh
+  Windows box. Help provided by David Bolen.
+
 - Issue #7328: pydoc no longer corrupts sys.path when run with the '-m' switch
 
 - Issue #7318: multiprocessing now uses a timeout when it fails to establish