[Python-checkins] r78877 - in python/branches/release26-maint: Lib/distutils/tests/test_build_ext.py Lib/distutils/tests/xxmodule.c Misc/NEWS

Fri Mar 12 19:27:14 CET 2010

Author: tarek.ziade
Date: Fri Mar 12 19:27:13 2010
New Revision: 78877
Log:
Merged revisions 78707,78709 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r78707 | tarek.ziade | 2010年03月05日 20:18:27 -0500 (2010年3月05日) | 1 line
 
 provide a fallback for xxmodule.c in case the buildir is not present
........
 r78709 | tarek.ziade | 2010年03月05日 20:23:21 -0500 (2010年3月05日) | 1 line
 
 simplified the fallback case
........
Added:
 python/branches/release26-maint/Lib/distutils/tests/xxmodule.c
 - copied unchanged from r78709, /python/trunk/Lib/distutils/tests/xxmodule.c
Modified:
 python/branches/release26-maint/ (props changed)
 python/branches/release26-maint/Lib/distutils/tests/test_build_ext.py
 python/branches/release26-maint/Misc/NEWS
Modified: python/branches/release26-maint/Lib/distutils/tests/test_build_ext.py
==============================================================================

--- python/branches/release26-maint/Lib/distutils/tests/test_build_ext.py	(original)
+++ python/branches/release26-maint/Lib/distutils/tests/test_build_ext.py	Fri Mar 12 19:27:13 2010
@@ -18,8 +18,7 @@
 ALREADY_TESTED = False
 
 def _get_source_filename():
- srcdir = sysconfig.get_config_var('srcdir')
- return os.path.join(srcdir, 'Modules', 'xxmodule.c')
+ return os.path.join(os.path.dirname(__file__), 'xxmodule.c')
 
 class BuildExtTestCase(support.TempdirManager,
 support.LoggingSilencer,
Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Fri Mar 12 19:27:13 2010
@@ -21,6 +21,7 @@
 -------
 
 - Reverting the changes made in r78432. Discussed in the tracker issue #7540.
+- Issue #8107: Fixed test_distutils so it uses a local xxmodule.c file.
 
 Extension Modules
 -----------------
