aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/plugins
diff options
context:
space:
mode:
authorRodney Ewing <ewing.rj@gmail.com>2013-05-27 11:13:23 -0700
committerRodney Ewing <ewing.rj@gmail.com>2013-05-27 11:14:08 -0700
commitb1e02e0a702ffd085abdb5a4e1d3ca0b9c6192f1 (patch)
treece605938b92236ebeaca9c900d15ae6f1957450e /mediagoblin/plugins
parentf81206df311afbe0fdbc3eeb03a6cc601ee5ae2b (diff)
downloadmediagoblin-b1e02e0a702ffd085abdb5a4e1d3ca0b9c6192f1.tar.lz
mediagoblin-b1e02e0a702ffd085abdb5a4e1d3ca0b9c6192f1.tar.xz
mediagoblin-b1e02e0a702ffd085abdb5a4e1d3ca0b9c6192f1.zip
modified get_user function to take kwargs instead of username
Diffstat (limited to 'mediagoblin/plugins')
-rw-r--r--mediagoblin/plugins/basic_auth/__init__.py18
1 files changed, 10 insertions, 8 deletions
diff --git a/mediagoblin/plugins/basic_auth/__init__.py b/mediagoblin/plugins/basic_auth/__init__.py
index 375af335..71e96d73 100644
--- a/mediagoblin/plugins/basic_auth/__init__.py
+++ b/mediagoblin/plugins/basic_auth/__init__.py
@@ -26,17 +26,19 @@ def setup_plugin():
config = pluginapi.get_config('mediagoblin.pluginapi.basic_auth')
-def get_user(username):
- user = User.query.filter(
- or_(
- User.username == username,
- User.email == username,
- )).first()
- return user
+def get_user(**kwargs):
+ username = kwargs.pop('username', None)
+ if 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.username.data)
+ user = get_user(username=registration_form.username.data)
if not user and 'password' in registration_form:
user = User()
user.username = registration_form.username.data