# HG changeset patch
# User Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
# Date 1433173231 -7200
# Node ID d7f13c2a28bacccdab00745a8dccf39fa4c40e31
# Parent  4e076ea72052bd030cb22d96005e69bb94fb9404
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.

diff -r 4e076ea72052 -r d7f13c2a28ba kallithea/model/user.py
--- 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)