Fixed auth to not use an internal implementation detail of SortedDict

from django import forms

from django.forms.util import flatatt

from django.template import loader

from django.utils.datastructures import SortedDict

from django.utils.html import format_html, format_html_join

from django.utils.http import int_to_base36

from django.utils.safestring import mark_safe

from django.contrib.auth.tokens import default_token_generator

from django.contrib.sites.models import get_current_site

UNMASKED_DIGITS_TO_SHOW = 6

mask_password = lambda p: "%s%s" % (p[:UNMASKED_DIGITS_TO_SHOW], "*" * max(len(p) - UNMASKED_DIGITS_TO_SHOW, 0))

            raise forms.ValidationError(

                self.error_messages['password_incorrect'])

        return old_password

PasswordChangeForm.base_fields.keyOrder = ['old_password', 'new_password1',

                                           'new_password2']

PasswordChangeForm.base_fields = SortedDict([

    (k, PasswordChangeForm.base_fields[k])

    for k in ['old_password', 'new_password1', 'new_password2']

])

class AdminPasswordChangeForm(forms.Form):