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

[1.9.x] Fixed #25457 -- Improved formatting of password validation errors in management command output. 

Backport of 7372cdebed from master
This commit is contained in:
Tzu-ping Chung 2015-09-25 02:18:58 +08:00 committed by Tim Graham
parent 9b5f1880e9
commit 9581ac39a8
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/auth/management/commands/changepassword.py
View File

@ -60,7 +60,7 @@ class Command(BaseCommand):
try: try:
validate_password(p2, u) validate_password(p2, u)
except ValidationError as err: except ValidationError as err:
self.stdout.write(', '.join(err.messages)) self.stderr.write('\n'.join(err.messages))
count += 1 count += 1
else: else:
password_validated = True password_validated = True

2
django/contrib/auth/management/commands/createsuperuser.py
View File

@ -153,7 +153,7 @@ class Command(BaseCommand):
try: try:
validate_password(password2, self.UserModel(**fake_user_data)) validate_password(password2, self.UserModel(**fake_user_data))
except exceptions.ValidationError as err: except exceptions.ValidationError as err:
self.stderr.write(', '.join(err.messages)) self.stderr.write('\n'.join(err.messages))
password = None password = None
except KeyboardInterrupt: except KeyboardInterrupt:

2
tests/auth_tests/test_management.py
View File

@ -160,7 +160,7 @@ class ChangepasswordManagementCommandTestCase(TestCase):
abort_msg = "Aborting password change for user 'joe' after 3 attempts" abort_msg = "Aborting password change for user 'joe' after 3 attempts"
with self.assertRaisesMessage(CommandError, abort_msg): with self.assertRaisesMessage(CommandError, abort_msg):
command.execute(username="joe", stdout=self.stdout, stderr=self.stderr) command.execute(username="joe", stdout=self.stdout, stderr=self.stderr)
self.assertIn('This password is entirely numeric.', self.stdout.getvalue()) self.assertIn('This password is entirely numeric.', self.stderr.getvalue())
def test_that_changepassword_command_works_with_nonascii_output(self): def test_that_changepassword_command_works_with_nonascii_output(self):
""" """