Mercurial > kallithea

changeset 5624:6de3e8907554

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
auth: clarify that extern_type and extern_name are strings, not unicode
author Mads Kiilerich <madski@unity3d.com>
date Tue, 05 Jan 2016 16:30:12 +0100
parents 2e977722f349
children 13da89053853
files kallithea/model/user.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/model/user.py	Tue Jan 05 16:30:12 2016 +0100
+++ b/kallithea/model/user.py	Tue Jan 05 16:30:12 2016 +0100
@@ -38,7 +38,7 @@
 from sqlalchemy.exc import DatabaseError
 
 from kallithea import EXTERN_TYPE_INTERNAL
-from kallithea.lib.utils2 import safe_unicode, generate_api_key, get_current_authuser
+from kallithea.lib.utils2 import safe_str, generate_api_key, get_current_authuser
 from kallithea.lib.caching_query import FromCache
 from kallithea.model import BaseModel
 from kallithea.model.db import User, UserToPerm, Notification, \
@@ -148,9 +148,9 @@
             new_user.admin = admin
             new_user.email = email
             new_user.active = active
-            new_user.extern_name = safe_unicode(extern_name) \
+            new_user.extern_name = safe_str(extern_name) \
                 if extern_name else None
-            new_user.extern_type = safe_unicode(extern_type) \
+            new_user.extern_type = safe_str(extern_type) \
                 if extern_type else None
             new_user.name = firstname
             new_user.lastname = lastname