summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTzu-ping Chung <uranusjr@gmail.com>2015-09-25 02:18:58 +0800
committerTim Graham <timograham@gmail.com>2015-09-24 19:45:48 -0400
commit9581ac39a8b913db22f9874ae04aad46548dcdeb (patch)
tree6496a657624c5b65000707e3a16cd0e9c2803d86
parent9b5f1880e9697e009d5bfda6df6c5b5f35ea02e9 (diff)
[1.9.x] Fixed #25457 -- Improved formatting of password validation errors in management command output.
Backport of 7372cdebed19a9d8e5527823c1e6825156babf98 from master
-rw-r--r--django/contrib/auth/management/commands/changepassword.py2
-rw-r--r--django/contrib/auth/management/commands/createsuperuser.py2
-rw-r--r--tests/auth_tests/test_management.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/django/contrib/auth/management/commands/changepassword.py b/django/contrib/auth/management/commands/changepassword.py
index 600911f759..162d08a3a9 100644
--- a/django/contrib/auth/management/commands/changepassword.py
+++ b/django/contrib/auth/management/commands/changepassword.py
@@ -60,7 +60,7 @@ class Command(BaseCommand):
try:
validate_password(p2, u)
except ValidationError as err:
- self.stdout.write(', '.join(err.messages))
+ self.stderr.write('\n'.join(err.messages))
count += 1
else:
password_validated = True
diff --git a/django/contrib/auth/management/commands/createsuperuser.py b/django/contrib/auth/management/commands/createsuperuser.py
index 56461cedfa..58364ec543 100644
--- a/django/contrib/auth/management/commands/createsuperuser.py
+++ b/django/contrib/auth/management/commands/createsuperuser.py
@@ -153,7 +153,7 @@ class Command(BaseCommand):
try:
validate_password(password2, self.UserModel(**fake_user_data))
except exceptions.ValidationError as err:
- self.stderr.write(', '.join(err.messages))
+ self.stderr.write('\n'.join(err.messages))
password = None
except KeyboardInterrupt:
diff --git a/tests/auth_tests/test_management.py b/tests/auth_tests/test_management.py
index 70d5ceac5b..435bc9e1e5 100644
--- a/tests/auth_tests/test_management.py
+++ b/tests/auth_tests/test_management.py
@@ -160,7 +160,7 @@ class ChangepasswordManagementCommandTestCase(TestCase):
abort_msg = "Aborting password change for user 'joe' after 3 attempts"
with self.assertRaisesMessage(CommandError, abort_msg):
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):
"""