Commit 471c9aee authored by Adrian Holovaty's avatar Adrian Holovaty
Browse files

Fixed #9158 -- Changed django-admin.py help to be printed to stdout instead of... 

Fixed #9158 -- Changed django-admin.py help to be printed to stdout instead of stderr, so that it's more easily greppable. Thanks, petr.marhoun@gmail.com

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15921 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 5d854608

django/core/management/__init__.py

+2 −2
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ class ManagementUtility(object): 
                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,7 +374,7 @@ class ManagementUtility(object): 
            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)

tests/regressiontests/admin_scripts/tests.py

+2 −2
Original line number Diff line number Diff line
@@ -1113,7 +1113,7 @@ class CommandTypes(AdminScriptTestCase): 
            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,7 +1123,7 @@ class CommandTypes(AdminScriptTestCase): 
            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"