aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodney Ewing <ewing.rj@gmail.com>2013-05-27 10:38:09 -0700
committerRodney Ewing <ewing.rj@gmail.com>2013-05-27 10:38:43 -0700
commitf81206df311afbe0fdbc3eeb03a6cc601ee5ae2b (patch)
treebc4149f2f967270d7cc0def0fb08607ba078ac49
parent0ccc722ddc2fabcd57b0a9b72d474feb5b312052 (diff)
downloadmediagoblin-f81206df311afbe0fdbc3eeb03a6cc601ee5ae2b.tar.lz
mediagoblin-f81206df311afbe0fdbc3eeb03a6cc601ee5ae2b.tar.xz
mediagoblin-f81206df311afbe0fdbc3eeb03a6cc601ee5ae2b.zip
no need for user might be email kwarg in check_login_simple
-rw-r--r--mediagoblin/auth/tools.py2
-rw-r--r--mediagoblin/auth/views.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/auth/tools.py b/mediagoblin/auth/tools.py
index 94f23993..7123473d 100644
--- a/mediagoblin/auth/tools.py
+++ b/mediagoblin/auth/tools.py
@@ -198,7 +198,7 @@ def register_user(request, register_form):
return None
-def check_login_simple(username, password, username_might_be_email=False):
+def check_login_simple(username, password):
user = auth.get_user(username)
if not user:
_log.info("User %r not found", username)
diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py
index b62602b3..f063add8 100644
--- a/mediagoblin/auth/views.py
+++ b/mediagoblin/auth/views.py
@@ -96,7 +96,7 @@ def login(request):
username = login_form.username.data
if login_form.validate():
- user = check_login_simple(username, login_form.password.data, True)
+ user = check_login_simple(username, login_form.password.data)
if user:
# set up login in session