p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #29301 -- Made management command --help display command-specific arguments before common arguments.

This commit is contained in:
David Foster 2018-04-07 17:10:05 -07:00 committed by Tim Graham
parent 2919a08c20
commit c3055242c8
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/core/management/base.py
View File

@ -228,6 +228,9 @@ class BaseCommand:
self, prog="%s %s" % (os.path.basename(prog_name), subcommand), self, prog="%s %s" % (os.path.basename(prog_name), subcommand),
description=self.help or None, description=self.help or None,
) )
# Add command-specific arguments first so that they appear in the
# --help output before arguments common to all commands.
self.add_arguments(parser)
parser.add_argument('--version', action='version', version=self.get_version()) parser.add_argument('--version', action='version', version=self.get_version())
parser.add_argument( parser.add_argument(
'-v', '--verbosity', action='store', dest='verbosity', default=1, '-v', '--verbosity', action='store', dest='verbosity', default=1,
@ -251,7 +254,6 @@ class BaseCommand:
'--no-color', action='store_true', dest='no_color', '--no-color', action='store_true', dest='no_color',
help="Don't colorize the command output.", help="Don't colorize the command output.",
) )
self.add_arguments(parser)
return parser return parser
def add_arguments(self, parser): def add_arguments(self, parser):

7
tests/admin_scripts/tests.py
View File

@ -1495,6 +1495,13 @@ class CommandTypes(AdminScriptTestCase):
args = ['check', '--help'] args = ['check', '--help']
out, err = self.run_manage(args) out, err = self.run_manage(args)
self.assertNoOutput(err) self.assertNoOutput(err)
# Command-specific options like --tag appear before options common to
# all commands like --version.
tag_location = out.find('--tag')
version_location = out.find('--version')
self.assertNotEqual(tag_location, -1)
self.assertNotEqual(version_location, -1)
self.assertLess(tag_location, version_location)
self.assertOutput(out, "Checks the entire Django project for potential problems.") self.assertOutput(out, "Checks the entire Django project for potential problems.")
def test_color_style(self): def test_color_style(self):