Change the test encoding from "ISO8859-1" to "ISO-8859-1"

(see SF bug #690309) and raise ImportErrors instead of
RuntimeErrors, so building Python continues even
if importing iconv_codecs fails.

This is a temporary fix until we get proper configure
support for "broken" iconv implementations.

diff --git a/Modules/_iconv_codec.c b/Modules/_iconv_codec.c
index 1d2e5d41387bddda2adff446dcf00dbaf4c9d20a..a26a3414238fd88ca96e2570bddcb7760968f068 100644 (file)
--- a/Modules/_iconv_codec.c
+++ b/Modules/_iconv_codec.c
@@ -671,17 +671,17 @@ init_iconv_codec(void)
     size_t outsize = sizeof(out);
     size_t res;
 
-    iconv_t hdl = iconv_open(UNICODE_ENCODING, "ISO8859-1");
+    iconv_t hdl = iconv_open(UNICODE_ENCODING, "ISO-8859-1");
 
     if (hdl == (iconv_t)-1) {
-        PyErr_SetString(PyExc_RuntimeError,
+        PyErr_SetString(PyExc_ImportError,
          "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_RuntimeError,
+        PyErr_SetString(PyExc_ImportError,
          "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_RuntimeError,
+        PyErr_SetString(PyExc_ImportError,
          "can't initialize the _iconv_codec module: mixed endianess");
        return;
     }