Mercurial > kallithea
changeset 5169:d7f13c2a28ba
UserModel: remove code duplication of User.get_by_username()
UserModel.get_by_username() and User.get_by_username() implement the same
logic and thus one should use the other instead of duplicating.
author | Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> |
---|---|
date | Mon, 01 Jun 2015 17:40:31 +0200 |
parents | 4e076ea72052 |
children | 65872885d876 |
files | kallithea/model/user.py |
diffstat | 1 files changed, 1 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/model/user.py Wed Jun 03 21:23:06 2015 +0200 +++ b/kallithea/model/user.py Mon Jun 01 17:40:31 2015 +0200 @@ -60,16 +60,7 @@ return self._get_user(user) def get_by_username(self, username, cache=False, case_insensitive=False): - - if case_insensitive: - user = self.sa.query(User).filter(User.username.ilike(username)) - else: - user = self.sa.query(User)\ - .filter(User.username == username) - if cache: - user = user.options(FromCache("sql_cache_short", - "get_user_%s" % username)) - return user.scalar() + return User.get_by_username(username, case_insensitive, cache) def get_by_email(self, email, cache=False, case_insensitive=False): return User.get_by_email(email, case_insensitive, cache)