aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/edit
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-09-19 18:02:43 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-09-19 18:02:43 -0500
commit201ac38895ae089eb38b1e4ba10a13f0ff495c97 (patch)
treeef533de619c13aec70f19d96bfef8faf98059bf3 /mediagoblin/edit
parent63856d4f56e68f4b31fb2b6422a8e9908ee500ef (diff)
downloadmediagoblin-201ac38895ae089eb38b1e4ba10a13f0ff495c97.tar.lz
mediagoblin-201ac38895ae089eb38b1e4ba10a13f0ff495c97.tar.xz
mediagoblin-201ac38895ae089eb38b1e4ba10a13f0ff495c97.zip
Fixing import error after merge of basic_auth branch.
This commit sponsored by geoffrey jost. Thank you!
Diffstat (limited to 'mediagoblin/edit')
-rw-r--r--mediagoblin/edit/views.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index da186758..140f9eec 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -23,7 +23,8 @@ from werkzeug.utils import secure_filename
from mediagoblin import messages
from mediagoblin import mg_globals
-from mediagoblin.auth import tools as auth_tools
+from mediagoblin.auth import (check_password,
+ tools as auth_tools)
from mediagoblin.edit import forms
from mediagoblin.edit.lib import may_edit_media
from mediagoblin.decorators import (require_active_login, active_user_from_url,
@@ -401,7 +402,7 @@ def change_email(request):
_('Sorry, a user with that email address'
' already exists.'))
- if form.password and user.pw_hash and not auth.check_password(
+ if form.password and user.pw_hash and not check_password(
form.password.data, user.pw_hash):
form.password.errors.append(
_('Wrong password'))