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.

diff --git a/Modules/_iconv_codec.c b/Modules/_iconv_codec.c
index a26a3414238fd88ca96e2570bddcb7760968f068..3570f461e5968169eecad6e08dbbe45b501faa87 100644 (file)
--- a/Modules/_iconv_codec.c
+++ b/Modules/_iconv_codec.c
@@ -674,14 +674,14 @@ init_iconv_codec(void)
     iconv_t hdl = iconv_open(UNICODE_ENCODING, "ISO-8859-1");
 
     if (hdl == (iconv_t)-1) {
-        PyErr_SetString(PyExc_ImportError,
+        PyErr_SetString(PyExc_RuntimeError,
          "can't initialize the _iconv_codec module: iconv_open() failed");
        return;
     }
 
     res = iconv(hdl, &inptr, &insize, &outptr, &outsize);
     if (res == (size_t)-1) {
-        PyErr_SetString(PyExc_ImportError,
+        PyErr_SetString(PyExc_RuntimeError,
          "can't initialize the _iconv_codec module: iconv() failed");
        return;
     }
@@ -698,7 +698,7 @@ init_iconv_codec(void)
        byteswap = 1;
     else {
        iconv_close(hdl);
-        PyErr_SetString(PyExc_ImportError,
+        PyErr_SetString(PyExc_RuntimeError,
          "can't initialize the _iconv_codec module: mixed endianess");
        return;
     }

diff --git a/setup.py b/setup.py
index ca4bf9f881e38159a5cbbb60af02a6935b0e520d..7c362f55cda8990866cd4d531a810c53fb8587f0 100644 (file)
--- a/setup.py
+++ b/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