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

 # -*- coding: utf-8 -*-
 """
     rhodecode.lib.__init__
     ~~~~~~~~~~~~~~~~~~~~~~~
     Some simple helper functions
     :created_on: Jan 5, 2011
     :author: marcink
     :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 def str2bool(s):
     if s is None:
         return False
     if s in (True, False):
         return s
     s = str(s).strip().lower()
     return s in ('t', 'true', 'y', 'yes', 'on', '1')
 def generate_api_key(username, salt=None):
     """
     Generates uniq API key for given username
     :param username: username as string
     :param salt: salt to hash generate KEY
     """
     from tempfile import _RandomNameSequence
     import hashlib
     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)