Ticket #8274: 8274.auth_forms.diff

django/django/contrib/auth/views.py

@@ -16 +16 @@
 from django.contrib.auth.models import User
 import re
 
-def login(request, template_name='registration/login.html', redirect_field_name=REDIRECT_FIELD_NAME):
+def login(request, template_name='registration/login.html', redirect_field_name=REDIRECT_FIELD_NAME, authentication_form=AuthenticationForm):
     "Displays the login form and handles the login action."
     redirect_to = request.REQUEST.get(redirect_field_name, '')
     if request.method == "POST":
-        form = AuthenticationForm(data=request.POST)
+        form = authentication_form(data=request.POST)
         if form.is_valid():
             # Light security check -- make sure redirect_to isn't garbage.
             if not redirect_to or '//' in redirect_to or ' ' in redirect_to:
@@ -32 +32 @@
                 request.session.delete_test_cookie()
             return HttpResponseRedirect(redirect_to)
     else:
-        form = AuthenticationForm(request)
+        form = authentication_form(request)
     request.session.set_test_cookie()
     if Site._meta.installed:
         current_site = Site.objects.get_current()
@@ -135 +135 @@
     return render_to_response(template_name, context_instance=RequestContext(request,
                                                                              {'login_url': settings.LOGIN_URL}))
 
-def password_change(request, template_name='registration/password_change_form.html'):
+def password_change(request, template_name='registration/password_change_form.html', password_change_form=PasswordChangeForm):
     if request.method == "POST":
-        form = PasswordChangeForm(request.user, request.POST)
+        form = password_change_form(request.user, request.POST)
         if form.is_valid():
             form.save()
             return HttpResponseRedirect(reverse('django.contrib.auth.views.password_change_done'))
     else:
-        form = PasswordChangeForm(request.user)
+        form = password_change_form(request.user)
     return render_to_response(template_name, {
         'form': form,
     }, context_instance=RequestContext(request))