From: Tarek Ziadé <ziade.tarek@gmail.com>
Date: Sat, 19 Sep 2009 09:58:51 +0000 (+0000)
Subject: Fixed #6947 - SO extension varies under windows
X-Git-Tag: v2.6.3rc1~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de2a107200e5073c7e3d6f58c88a407ac69c319d;p=thirdparty%2FPython%2Fcpython.git

Fixed #6947 - SO extension varies under windows
---

diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py
index d8d3667751fb..94000a57d96d 100644
--- a/Lib/distutils/tests/test_build_ext.py
+++ b/Lib/distutils/tests/test_build_ext.py
@@ -338,7 +338,8 @@ class BuildExtTestCase(support.TempdirManager,
         cmd.distribution.package_dir = {'': 'src'}
         cmd.distribution.packages = ['lxml', 'lxml.html']
         curdir = os.getcwd()
-        wanted = os.path.join(curdir, 'src', 'lxml', 'etree.so')
+        ext = sysconfig.get_config_var("SO")
+        wanted = os.path.join(curdir, 'src', 'lxml', 'etree' + ext)
         path = cmd.get_ext_fullpath('lxml.etree')
         self.assertEquals(wanted, path)
 
diff --git a/Misc/NEWS b/Misc/NEWS
index 8fc2f44c850f..afe34bf474f9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -82,6 +82,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #6947: Fix distutils test on windows. Patch by Hirokazu Yamamoto.
+
 - Issue #4606: Passing 'None' if ctypes argtype is set to POINTER(...)
   does now always result in NULL.