Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Walter Dörwald 2003-02-24 20:17:32 +00:00
parent 0f69833396
commit dd8766a65b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/_iconv_codec.c
View File

@ -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;
}