kallithea Changeset - a2efbfe84067

Changeset - a2efbfe84067

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 14 years ago 2011-09-30 17:11:50
marcin@python-works.com

fixes safe_unicode raise UnicodeDecodeError without any parameters

1 file changed with 7 insertions and 4 deletions:

rhodecode/lib/__init__.py

0 comments (0 inline, 0 general)

rhodecode/lib/__init__.py

➞

Show inline comments

@@ @@ -168,11 +168,15 @@ def safe_unicode(str_, from_encoding='ut @@
     :rtype: unicode
     :returns: unicode object
     """
     if isinstance(str_, unicode):
         return str_
     try:
         return unicode(str_)
     except UnicodeDecodeError:
         pass
     try:
         return unicode(str_, from_encoding)
     except UnicodeDecodeError:
         pass
@@ @@ -181,10 +185,9 @@ def safe_unicode(str_, from_encoding='ut @@
         import chardet
         encoding = chardet.detect(str_)['encoding']
         if encoding is None:
             raise UnicodeDecodeError()
             raise Exception()
         return str_.decode(encoding)
     except (ImportError, UnicodeDecodeError):
+    except (ImportError, UnicodeDecodeError, Exception):
         return unicode(str_, from_encoding, 'replace')
 def safe_str(unicode_, to_encoding='utf8'):

0 comments (0 inline, 0 general)