[Python-checkins] python/dist/src/Modules _iconv_codec.c,1.12,1.13

[doerwalter@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1:/tmp/cvs-serv8639/Modules

Modified Files:
	_iconv_codec.c 
Log Message:
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.


Index: _iconv_codec.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_iconv_codec.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** _iconv_codec.c	21 Feb 2003 18:18:49 -0000	1.12
--- _iconv_codec.c	24 Feb 2003 20:17:32 -0000	1.13
***************
*** 672,679 ****
      size_t res;
  
!     iconv_t hdl = iconv_open(UNICODE_ENCODING, "ISO8859-1");
  
      if (hdl == (iconv_t)-1) {
!         PyErr_SetString(PyExc_RuntimeError,
  	  "can't initialize the _iconv_codec module: iconv_open() failed");
  	return;
--- 672,679 ----
      size_t res;
  
!     iconv_t hdl = iconv_open(UNICODE_ENCODING, "ISO-8859-1");
  
      if (hdl == (iconv_t)-1) {
!         PyErr_SetString(PyExc_ImportError,
  	  "can't initialize the _iconv_codec module: iconv_open() failed");
  	return;
***************
*** 682,686 ****
      res = iconv(hdl, &inptr, &insize, &outptr, &outsize);
      if (res == (size_t)-1) {
!         PyErr_SetString(PyExc_RuntimeError,
  	  "can't initialize the _iconv_codec module: iconv() failed");
  	return;
--- 682,686 ----
      res = iconv(hdl, &inptr, &insize, &outptr, &outsize);
      if (res == (size_t)-1) {
!         PyErr_SetString(PyExc_ImportError,
  	  "can't initialize the _iconv_codec module: iconv() failed");
  	return;
***************
*** 699,703 ****
      else {
  	iconv_close(hdl);
!         PyErr_SetString(PyExc_RuntimeError,
  	  "can't initialize the _iconv_codec module: mixed endianess");
  	return;
--- 699,703 ----
      else {
  	iconv_close(hdl);
!         PyErr_SetString(PyExc_ImportError,
  	  "can't initialize the _iconv_codec module: mixed endianess");
  	return;