From: Tarek Ziadé <ziade.tarek@gmail.com>
Date: Thu, 19 Nov 2009 05:39:00 +0000 (+0000)
Subject: Merged revisions 76399 via svnmerge from
X-Git-Tag: v3.2a1~2153
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=26afd485ce46b6143a8568bebf648ca0d3f525b2;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 76399 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76399 | tarek.ziade | 2009-11-19 06:33:16 +0100 (Thu, 19 Nov 2009) | 1 line

  dragfullwindows can have value 2
........
---

diff --git a/Lib/distutils/tests/test_msvc9compiler.py b/Lib/distutils/tests/test_msvc9compiler.py
index 7cf1a12ec7a0..05d34e604c27 100644
--- a/Lib/distutils/tests/test_msvc9compiler.py
+++ b/Lib/distutils/tests/test_msvc9compiler.py
@@ -46,7 +46,7 @@ class msvc9compilerTestCase(unittest.TestCase):
         # windows registeries versions.
         path = r'Control Panel\Desktop'
         v = Reg.get_value(path, 'dragfullwindows')
-        self.assertTrue(v in ('0', '1'))
+        self.assertTrue(v in ('0', '1', '2'))
 
         import winreg
         HKCU = winreg.HKEY_CURRENT_USER
diff --git a/Misc/NEWS b/Misc/NEWS
index bc1d91a16c4b..a455a76cfc82 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -137,6 +137,9 @@ C-API
 Library
 -------
 
+- Issue #7354: distutils.tests.test_msvc9compiler - dragfullwindows can 
+  be 2.
+
 - Issue #5037: Proxy the __unicode__ special method instead to __unicode__
   instead of __str__.