Ticket #9158: django-admin-stdout_with_test.diff

tests/regressiontests/admin_scripts/tests.py

@@ -1113 +1113 @@
             self.assertOutput(out, "usage: manage.py subcommand [options] [args]")
         else:
             self.assertOutput(out, "Usage: manage.py subcommand [options] [args]")
-        self.assertOutput(err, "Type 'manage.py help <subcommand>' for help on a specific subcommand.")
+        self.assertOutput(out, "Type 'manage.py help <subcommand>' for help on a specific subcommand.")
 
     def test_short_help(self):
         "-h is handled as a short form of --help"
@@ -1123 +1123 @@
             self.assertOutput(out, "usage: manage.py subcommand [options] [args]")
         else:
             self.assertOutput(out, "Usage: manage.py subcommand [options] [args]")
-        self.assertOutput(err, "Type 'manage.py help <subcommand>' for help on a specific subcommand.")
+        self.assertOutput(out, "Type 'manage.py help <subcommand>' for help on a specific subcommand.")
 
     def test_specific_help(self):
         "--help can be used on a specific command"

django/core/management/__init__.py

@@ -365 +365 @@
                 self.fetch_command(args[2]).print_help(self.prog_name, args[2])
             else:
                 parser.print_lax_help()
-                sys.stderr.write(self.main_help_text() + '\n')
+                sys.stdout.write(self.main_help_text() + '\n')
                 sys.exit(1)
         # Special-cases: We want 'django-admin.py --version' and
         # 'django-admin.py --help' to work, for backwards compatibility.
@@ -374 +374 @@
             pass
         elif self.argv[1:] in (['--help'], ['-h']):
             parser.print_lax_help()
-            sys.stderr.write(self.main_help_text() + '\n')
+            sys.stdout.write(self.main_help_text() + '\n')
         else:
             self.fetch_command(subcommand).run_from_argv(self.argv)