From dd8766a65bed9b86f9309f9b743b5d0f1074779e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Walter=20D=C3=B6rwald?= Date: Mon, 24 Feb 2003 20:17:32 +0000 Subject: [PATCH] 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. --- Modules/_iconv_codec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Modules/_iconv_codec.c b/Modules/_iconv_codec.c index 1d2e5d4138..a26a341423 100644 --- 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; } -- 2.40.0