mirror of
https://github.com/python/cpython.git
synced 2025-10-21 14:12:27 +00:00
Fix SF bug #690012 (among others), iconv_codec stops build
Change setup.py to catch all exceptions. - Rename module if the exception was an ImportError - Only warn if the exception was any other error Revert _iconv_codec to raising a RuntimeError.
This commit is contained in:
parent
edaa071eb4
commit
3f5fcc8acc
2 changed files with 8 additions and 6 deletions
8
setup.py
8
setup.py
|
@ -207,9 +207,10 @@ class PyBuildExt(build_ext):
|
|||
self.get_ext_filename(self.get_ext_fullname(ext.name)))
|
||||
try:
|
||||
imp.load_dynamic(ext.name, ext_filename)
|
||||
except ImportError, why:
|
||||
except:
|
||||
|
||||
if 1:
|
||||
exc_type, why, tb = sys.exc_info()
|
||||
if issubclass(exc_type, ImportError):
|
||||
self.announce('*** WARNING: renaming "%s" since importing it'
|
||||
' failed: %s' % (ext.name, why), level=3)
|
||||
assert not self.inplace
|
||||
|
@ -231,7 +232,8 @@ class PyBuildExt(build_ext):
|
|||
self.announce('unable to remove files (ignored)')
|
||||
else:
|
||||
self.announce('*** WARNING: importing extension "%s" '
|
||||
'failed: %s' % (ext.name, why), level=3)
|
||||
'failed with %s: %s' % (ext.name, exc_type, why),
|
||||
level=3)
|
||||
|
||||
def get_platform (self):
|
||||
# Get value of sys.platform
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue