Merged revisions 71886 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r71886 | tarek.ziade | 2009-04-25 14:53:56 +0200 (Sat, 25 Apr 2009) | 9 lines

  Merged revisions 71884 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r71884 | tarek.ziade | 2009-04-25 14:51:59 +0200 (Sat, 25 Apr 2009) | 1 line

    #5810: Fixed Distutils test_build_scripts
  ........
................

diff --git a/Lib/distutils/tests/test_build_scripts.py b/Lib/distutils/tests/test_build_scripts.py
index 2acfab828effc5bd38c641a80a86d7398cbfa609..b55eb5857be523edccb9a524ec6ef18d489f0807 100644 (file)
--- a/Lib/distutils/tests/test_build_scripts.py
+++ b/Lib/distutils/tests/test_build_scripts.py
@@ -90,7 +90,7 @@ class BuildScriptsTestCase(support.TempdirManager,
         # On linux-g++-32 with command line `./configure --enable-ipv6
         # --with-suffix=3`, python is compiled okay but the build scripts
         # failed when writing the name of the executable
-        old = sysconfig._config_vars.get('VERSION')
+        old = sysconfig.get_config_vars().get('VERSION')
         sysconfig._config_vars['VERSION'] = 4
         try:
             cmd.run()

diff --git a/Misc/NEWS b/Misc/NEWS
index 5e9b9df8a08013d29f7dfb0aa09c632da17947c2..e1baa8a1117614a53f9c8cbc7e798268fe34a310 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -239,6 +239,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #5810: Fixed Distutils test_build_scripts so it uses 
+  sysconfig.get_config_vars.
+
 - Issue #5041: ctypes does now allow pickling wide character.
 
 - Issue #5731: Distutils bdist_wininst no longer worked on non-Windows