Commit dd8766a6 authored by Walter Dörwald's avatar Walter Dörwald

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.
parent 0f698333
......@@ -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;
}
......
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