From: Neal Norwitz <nnorwitz@gmail.com>
Date: Fri, 28 Feb 2003 20:00:42 +0000 (+0000)
Subject: Handle iconv initialization erorrs
X-Git-Tag: v2.3c1~1640
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6156a2d07cc26e89a068bff7a4b7bbc84167d415;p=thirdparty%2FPython%2Fcpython.git

Handle iconv initialization erorrs
---

diff --git a/Lib/encodings/__init__.py b/Lib/encodings/__init__.py
index 5e4167b28caa..e312fb80eb9c 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