diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2003-04-03 04:49:12 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2003-04-03 04:49:12 (GMT) |
| commit | 7fb697b5d26b1c9a379978653db97a84d7270141 (patch) | |
| tree | 322bdf5813ad18b0fc17635fbdf6f2301690d2d6 /Lib/encodings | |
| parent | 1e469c5603549310699dbfcb66dd38a7ccd3b404 (diff) | |
| download | cpython-7fb697b5d26b1c9a379978653db97a84d7270141.zip cpython-7fb697b5d26b1c9a379978653db97a84d7270141.tar.gz cpython-7fb697b5d26b1c9a379978653db97a84d7270141.tar.bz2 | |
Revert Patch #670715: iconv support.
Diffstat (limited to 'Lib/encodings')
| -rw-r--r-- | Lib/encodings/__init__.py | 5 | ||||
| -rw-r--r-- | Lib/encodings/iconv_codec.py | 34 |
2 files changed, 0 insertions, 39 deletions
diff --git a/Lib/encodings/__init__.py b/Lib/encodings/__init__.py index e312fb8..a214190 100644 --- a/Lib/encodings/__init__.py +++ b/Lib/encodings/__init__.py @@ -121,8 +121,3 @@ def search_function(encoding): # Register the search_function in the Python codec registry codecs.register(search_function) -# Register iconv_codec lookup function if available -try: - import iconv_codec -except (ImportError, RuntimeError): - pass diff --git a/Lib/encodings/iconv_codec.py b/Lib/encodings/iconv_codec.py deleted file mode 100644 index 8bd0c3f..0000000 --- a/Lib/encodings/iconv_codec.py +++ /dev/null @@ -1,34 +0,0 @@ -""" Python 'iconv' Codec - - -Written by Hye-Shik Chang (perky@FreeBSD.org). - -Copyright(c) Python Software Foundation, All Rights Reserved. NO WARRANTY. - -""" - -import _iconv_codec -import codecs - -def lookup(enc): - class IconvCodec(_iconv_codec.iconvcodec, codecs.Codec): - encoding = enc - - try: - c = IconvCodec() - - class IconvStreamReader(IconvCodec, codecs.StreamReader): - __init__ = codecs.StreamReader.__init__ - class IconvStreamWriter(IconvCodec, codecs.StreamWriter): - __init__ = codecs.StreamWriter.__init__ - - return ( - c.encode, c.decode, - IconvStreamReader, IconvStreamWriter - ) - except ValueError: - return None - -codecs.register(lookup) - -# ex: ts=8 sts=4 et |