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

Backport of r15605 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15609 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/core/management/__init__.py

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

tests/regressiontests/admin_scripts/tests.py

@@ -1031,6 +1031,16 @@ class CommandTypes(AdminScriptTestCase):
             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_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):
         "--help can be used on a specific command"
         args = ['sqlall','--help']