aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2003-02-28 20:00:42 +0000
committerNeal Norwitz <nnorwitz@gmail.com>2003-02-28 20:00:42 +0000
commit6156a2d07cc26e89a068bff7a4b7bbc84167d415 (patch)
treed8b6f509583ee9f1908a87f73be75a4fe60d3922 /Lib/encodings/__init__.py
parentFix SF bugs #692951 and 692988, test_timeout.py needs 'network' resource (diff)
downloadcpython-6156a2d07cc26e89a068bff7a4b7bbc84167d415.tar.gz
cpython-6156a2d07cc26e89a068bff7a4b7bbc84167d415.tar.bz2
cpython-6156a2d07cc26e89a068bff7a4b7bbc84167d415.zip
Handle iconv initialization erorrs
Diffstat (limited to 'Lib/encodings/__init__.py')
-rw-r--r--Lib/encodings/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/encodings/__init__.py b/Lib/encodings/__init__.py
index 5e4167b28ca..e312fb80eb9 100644
--- a/Lib/encodings/__init__.py
+++ b/Lib/encodings/__init__.py
@@ -124,5 +124,5 @@ codecs.register(search_function)
# Register iconv_codec lookup function if available
try:
import iconv_codec
-except ImportError:
+except (ImportError, RuntimeError):
pass