Fixing import error after merge of basic_auth branch.
authorChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 19 Sep 2013 23:02:43 +0000 (18:02 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 19 Sep 2013 23:02:43 +0000 (18:02 -0500)
This commit sponsored by geoffrey jost.  Thank you!

mediagoblin/edit/views.py

index da18675803d6d51b520a7e230a6fa2e6b4c90e5d..140f9eecbb2ece526d1d50c1a55738bc3a5c68bd 100644 (file)
@@ -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'))