kallithea Changeset - 2c246d24eb90

Changeset - 2c246d24eb90

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 15 years ago 2011-04-06 20:25:51
marcin@python-works.com

simplified safe_unicode function

1 file changed with 8 insertions and 9 deletions:

rhodecode/lib/__init__.py

0 comments (0 inline, 0 general)

rhodecode/lib/__init__.py

➞

Show inline comments

@@ @@ -43,26 +43,25 @@ def generate_api_key(username, salt=None @@
     if salt is None:
         salt = _RandomNameSequence().next()
     return hashlib.sha1(username + salt).hexdigest()
 def safe_unicode(_str):
+def safe_unicode(_str, from_encoding='utf8'):
     """
     safe unicode function. In case of UnicodeDecode error we try to return
     unicode with errors replace, if this fails we return unicode with
     string_escape decoding
     unicode with errors replace
     :param _str: string to decode
     :rtype: unicode
     :returns: unicode object
     """
     if isinstance(_str, unicode):
         return _str
     try:
         u_str = unicode(_str)
+        u_str = unicode(_str, from_encoding)
     except UnicodeDecodeError:
         try:
             u_str = _str.decode('utf-8', 'replace')
         except UnicodeDecodeError:
             #incase we have a decode error just represent as byte string
             u_str = unicode(_str.encode('string_escape'))
         u_str = unicode(_str, from_encoding, 'replace')
     return u_str

0 comments (0 inline, 0 general)