Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #9158 -- Changed django-admin.py help to be printed to stdout i…

…nstead 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
  • Loading branch information...
commit 471c9aee9771da32b942e71c7dcaef97a4c70f1c 1 parent 5d85460
@adrianholovaty adrianholovaty authored
View
4 django/core/management/__init__.py
@@ -365,7 +365,7 @@ def execute(self):
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 @@ def execute(self):
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)
View
4 tests/regressiontests/admin_scripts/tests.py
@@ -1113,7 +1113,7 @@ def test_help(self):
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 @@ def test_short_help(self):
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"

0 comments on commit 471c9ae

Please sign in to comment.
Something went wrong with that request. Please try again.