p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[1.9.x] Refs #16860 -- Fixed password help text when there aren't any validators. 

This avoids creating an empty list which is invalid HTML 4.

Backport of 53ccffdb8c from master
This commit is contained in:
Antoine Catton 2015-09-25 15:32:23 -06:00 committed by Tim Graham
parent 0094fb6be8
commit db88e40312
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/auth/password_validation.py
View File

@ -84,7 +84,7 @@ def password_validators_help_text_html(password_validators=None):
"""
help_texts = password_validators_help_texts(password_validators)
help_items = [format_html('<li>{}</li>', help_text) for help_text in help_texts]
return '<ul>%s</ul>' % ''.join(help_items)
return '<ul>%s</ul>' % ''.join(help_items) if help_items else ''
class MinimumLengthValidator(object):

4
tests/auth_tests/test_validators.py
View File

@ -68,6 +68,10 @@ class PasswordValidationTest(TestCase):
self.assertEqual(help_text.count('<li>'), 2)
self.assertIn('12 characters', help_text)
@override_settings(AUTH_PASSWORD_VALIDATORS=[])
def test_empty_password_validator_help_text_html(self):
self.assertEqual(password_validators_help_text_html(), '')
class MinimumLengthValidatorTest(TestCase):
def test_validate(self):