summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2009-04-29 08:07:44 (GMT)
committerTarek Ziadé <ziade.tarek@gmail.com>2009-04-29 08:07:44 (GMT)
commit8162382c486aac88b4a7c046515bc7c6b1bfc6c8 (patch)
tree3319df7620f8159de10fe9eb492f6826f3279488
parent476b355d631a2d5d9c33568d3bff871b55b9aa5e (diff)
downloadcpython-8162382c486aac88b4a7c046515bc7c6b1bfc6c8.zip
cpython-8162382c486aac88b4a7c046515bc7c6b1bfc6c8.tar.gz
cpython-8162382c486aac88b4a7c046515bc7c6b1bfc6c8.tar.bz2
Merged revisions 72094 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r72094 | tarek.ziade | 2009-04-29 10:03:46 +0200 (Wed, 29 Apr 2009) | 1 line Fixed #5874 : distutils.tests.test_config_cmd is not locale-sensitive anymore ........
-rw-r--r--Lib/distutils/tests/test_config_cmd.py2
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/distutils/tests/test_config_cmd.py b/Lib/distutils/tests/test_config_cmd.py
index 1e6ebfa..bacf13a 100644
--- a/Lib/distutils/tests/test_config_cmd.py
+++ b/Lib/distutils/tests/test_config_cmd.py
@@ -46,7 +46,7 @@ class ConfigTestCase(support.LoggingSilencer,
match = cmd.search_cpp(pattern='xxx', body='// xxx')
self.assertEquals(match, 0)
- match = cmd.search_cpp(pattern='command', body='// xxx')
+ match = cmd.search_cpp(pattern='_configtest', body='// xxx')
self.assertEquals(match, 1)
def test_finalize_options(self):
diff --git a/Misc/NEWS b/Misc/NEWS
index 251a8eb..54a3b09 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -473,6 +473,9 @@ Core and Builtins
Library
-------
+- Issue #5874: distutils.tests.test_config_cmd is not locale-sensitive
+ anymore.
+
- Issue #5810: Fixed Distutils test_build_scripts so it uses
sysconfig.get_config_vars.