summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2009-11-19 05:39:00 (GMT)
committerTarek Ziadé <ziade.tarek@gmail.com>2009-11-19 05:39:00 (GMT)
commit26afd485ce46b6143a8568bebf648ca0d3f525b2 (patch)
treee3d326f4316431297bde3db82f7e7470353df712
parent32019774b98d0b140cec1f16e46e4268d0f2cf7f (diff)
downloadcpython-26afd485ce46b6143a8568bebf648ca0d3f525b2.zip
cpython-26afd485ce46b6143a8568bebf648ca0d3f525b2.tar.gz
cpython-26afd485ce46b6143a8568bebf648ca0d3f525b2.tar.bz2
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 ........
-rw-r--r--Lib/distutils/tests/test_msvc9compiler.py2
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/distutils/tests/test_msvc9compiler.py b/Lib/distutils/tests/test_msvc9compiler.py
index 7cf1a12..05d34e6 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 bc1d91a..a455a76 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__.