From cdc6b571e33ee0cd90fa8f2be270df77d7f6d9d9 Mon Sep 17 00:00:00 2001 From: Rodney Ewing Date: Mon, 27 May 2013 08:39:34 -0700 Subject: cleanup after merge --- mediagoblin/plugins/basic_auth/__init__.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'mediagoblin/plugins') diff --git a/mediagoblin/plugins/basic_auth/__init__.py b/mediagoblin/plugins/basic_auth/__init__.py index 2fe161cb..edbfacb5 100644 --- a/mediagoblin/plugins/basic_auth/__init__.py +++ b/mediagoblin/plugins/basic_auth/__init__.py @@ -34,19 +34,17 @@ def check_login(user, password): return None -def get_user(form): - if 'username' in form.data: - username = form.username.data - user = User.query.filter( - or_( - User.username == username, - User.email == username, - )).first() - return user +def get_user(username): + user = User.query.filter( + or_( + User.username == username, + User.email == username, + )).first() + return user def create_user(registration_form): - user = get_user(registration_form) + user = get_user(registration_form.username.data) if not user and 'password' in registration_form: user = User() user.username = registration_form.username.data -- cgit v1.2.3