innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #15359 -- Ensure that the -h option is always honored by django-admin.py. Thanks to teubank for the report. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15605 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2011-02-21 13:45:57 +00:00
parent b700c3a918
commit b151bccdcc
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/core/management/__init__.py
View File

@ -372,7 +372,7 @@ class ManagementUtility(object):
elif self.argv[1:] == ['--version']: elif self.argv[1:] == ['--version']:
# LaxOptionParser already takes care of printing the version. # LaxOptionParser already takes care of printing the version.
pass pass
elif self.argv[1:] == ['--help']: elif self.argv[1:] in (['--help'], ['-h']):
parser.print_lax_help() parser.print_lax_help()
sys.stderr.write(self.main_help_text() + '\n') sys.stderr.write(self.main_help_text() + '\n')
else: else:

10
tests/regressiontests/admin_scripts/tests.py
View File

@ -1115,6 +1115,16 @@ class CommandTypes(AdminScriptTestCase):
self.assertOutput(out, "Usage: manage.py subcommand [options] [args]") 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(err, "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"
args = ['-h']
out, err = self.run_manage(args)
if sys.version_info < (2, 5):
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.")
def test_specific_help(self): def test_specific_help(self):
"--help can be used on a specific command" "--help can be used on a specific command"
args = ['sqlall','--help'] args = ['sqlall','--help']