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

diff --git a/Lib/distutils/tests/test_config_cmd.py b/Lib/distutils/tests/test_config_cmd.py
index 1e6ebfacf57db04180b3c2948c7e19b3f3d92b18..bacf13a2914b679e60859adf7a3118dcfb6719ef 100644 (file)
--- 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 251a8ebe2fa0330ac72402053b641f0cc71c010e..54a3b093f8089d4d4b3884df67ee5059ad619148 100644 (file)
--- 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.