[Python-checkins] r76402 - in python/branches/release31-maint: Lib/distutils/tests/test_msvc9compiler.py Misc/NEWS

[tarek.ziade]

Author: tarek.ziade
Date: Thu Nov 19 06:41:34 2009
New Revision: 76402

Log:
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
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/distutils/tests/test_msvc9compiler.py
   python/branches/release31-maint/Misc/NEWS

Modified: python/branches/release31-maint/Lib/distutils/tests/test_msvc9compiler.py
==============================================================================
--- python/branches/release31-maint/Lib/distutils/tests/test_msvc9compiler.py	(original)
+++ python/branches/release31-maint/Lib/distutils/tests/test_msvc9compiler.py	Thu Nov 19 06:41:34 2009
@@ -46,7 +46,7 @@
         # 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

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Thu Nov 19 06:41:34 2009
@@ -46,6 +46,9 @@
 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.