diff --git a/rhodecode/api/tests/conftest.py b/rhodecode/api/tests/conftest.py --- a/rhodecode/api/tests/conftest.py +++ b/rhodecode/api/tests/conftest.py @@ -45,7 +45,7 @@ def testuser_api(request, pylonsapp): # create TOKEN for user, if he doesn't have one if not cls.test_user.api_key: AuthTokenModel().create( - user=cls.test_user, description='TEST_USER_TOKEN') + user=cls.test_user, description=u'TEST_USER_TOKEN') Session().commit() cls.TEST_USER_LOGIN = cls.test_user.username diff --git a/rhodecode/lib/db_manage.py b/rhodecode/lib/db_manage.py --- a/rhodecode/lib/db_manage.py +++ b/rhodecode/lib/db_manage.py @@ -575,7 +575,7 @@ class DbManage(object): strict_creation_check=True, api_key=None): log.info('creating user %s' % username) user = UserModel().create_or_update( - username, password, email, firstname='RhodeCode', lastname='Admin', + username, password, email, firstname=u'RhodeCode', lastname=u'Admin', active=True, admin=admin, extern_type="rhodecode", strict_creation_check=strict_creation_check) @@ -583,7 +583,7 @@ class DbManage(object): log.info('setting a provided api key for the user %s', username) from rhodecode.model.auth_token import AuthTokenModel AuthTokenModel().create( - user=user, description='BUILTIN TOKEN') + user=user, description=u'BUILTIN TOKEN') def create_default_user(self): log.info('creating default user') @@ -591,8 +591,8 @@ class DbManage(object): user = UserModel().create_or_update(username=User.DEFAULT_USER, password=str(uuid.uuid1())[:20], email=User.DEFAULT_USER_EMAIL, - firstname='Anonymous', - lastname='User', + firstname=u'Anonymous', + lastname=u'User', strict_creation_check=False) # based on configuration options activate/deactive this user which # controlls anonymous access diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py --- a/rhodecode/model/user.py +++ b/rhodecode/model/user.py @@ -370,7 +370,7 @@ class UserModel(BaseModel): if not edit: # add the RSS token AuthTokenModel().create(username, - description='Generated feed token', + description=u'Generated feed token', role=AuthTokenModel.cls.ROLE_FEED) kwargs = new_user.get_dict() # backward compat, require api_keys present diff --git a/rhodecode/tests/fixture.py b/rhodecode/tests/fixture.py --- a/rhodecode/tests/fixture.py +++ b/rhodecode/tests/fixture.py @@ -264,7 +264,7 @@ class Fixture(object): # create token for user AuthTokenModel().create( - user=user, description='TEST_USER_TOKEN') + user=user, description=u'TEST_USER_TOKEN') Session().commit() user = User.get_by_username(user.username)