From: Tarek Ziadé <ziade.tarek@gmail.com>
Date: Thu, 19 Nov 2009 05:41:34 +0000 (+0000)
Subject: Merged revisions 76401 via svnmerge from
X-Git-Tag: v3.1.2rc1~322
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fd9ac226aa040b2cc790e7818d4e973ddf65b025;p=python

Merged revisions 76401 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76401 | tarek.ziade | 2009-11-19 06:39:00 +0100 (Thu, 19 Nov 2009) | 9 lines

  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 7cf1a12ec7..05d34e604c 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 ba07336fdd..fada4904a4 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -46,6 +46,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #7354: distutils.tests.test_msvc9compiler - dragfullwindows can 
+  be 2.
+
 - Issue #3976: pprint for sets, frozensets, and dicts now succeed when
   they contain unorderable types.