diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2011-03-26 17:45:42 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2011-03-26 17:45:42 +0000 |
| commit | 471c9aee9771da32b942e71c7dcaef97a4c70f1c (patch) | |
| tree | 6f702b8973308c8bbcbb209fb19cb02b76f390ed | |
| parent | 5d854608feb40ff2a4e205f202d267f0f964a2b0 (diff) | |
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
| -rw-r--r-- | django/core/management/__init__.py | 4 | ||||
| -rw-r--r-- | tests/regressiontests/admin_scripts/tests.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/django/core/management/__init__.py b/django/core/management/__init__.py index bafab17112..edc36f4f0f 100644 --- a/django/core/management/__init__.py +++ b/django/core/management/__init__.py @@ -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) diff --git a/tests/regressiontests/admin_scripts/tests.py b/tests/regressiontests/admin_scripts/tests.py index ed4bd356ba..290a3cad7c 100644 --- a/tests/regressiontests/admin_scripts/tests.py +++ b/tests/regressiontests/admin_scripts/tests.py @@ -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" |