Kaydet (Commit) af14289c authored tarafından Michael W. Hudson's avatar Michael W. Hudson

Fix for

[ #433775 ] module build dir first in test import

though not in the way the summary would suggest; use imp.load_dynamic()
in setup.py to ensure we're testing the dynamic object we think we are.
üst 5b10910d
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
__version__ = "$Revision$" __version__ = "$Revision$"
import sys, os, getopt import sys, os, getopt, imp
from distutils import sysconfig from distutils import sysconfig
from distutils import text_file from distutils import text_file
from distutils.errors import * from distutils.errors import *
...@@ -168,8 +168,11 @@ class PyBuildExt(build_ext): ...@@ -168,8 +168,11 @@ class PyBuildExt(build_ext):
'WARNING: skipping import check for Carbon-based "%s"' % 'WARNING: skipping import check for Carbon-based "%s"' %
ext.name) ext.name)
return return
ext_filename = os.path.join(
self.build_lib,
self.get_ext_filename(self.get_ext_fullname(ext.name)))
try: try:
__import__(ext.name) imp.load_dynamic(ext.name, ext_filename)
except ImportError: except ImportError:
self.announce('WARNING: removing "%s" since importing it failed' % self.announce('WARNING: removing "%s" since importing it failed' %
ext.name) ext.name)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment