diff --git a/rhodecode/lib/__init__.py b/rhodecode/lib/__init__.py --- a/rhodecode/lib/__init__.py +++ b/rhodecode/lib/__init__.py @@ -4,22 +4,22 @@ ~~~~~~~~~~~~~~~~~~~~~~~ Some simple helper functions - + :created_on: Jan 5, 2011 :author: marcink - :copyright: (C) 2009-2010 Marcin Kuzminski + :copyright: (C) 2009-2010 Marcin Kuzminski :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; version 2 # of the License or (at your opinion) any later version of the license. -# +# # 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, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, @@ -36,7 +36,7 @@ def str2bool(s): 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 """ @@ -51,8 +51,8 @@ def generate_api_key(username, salt=None def safe_unicode(_str): """ 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, if this fails we return unicode with + string_escape decoding """ if isinstance(_str, unicode):