From fee8a498660374cfe9e710bd96d6f84fa64c1a2d Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon, 21 Feb 2011 14:06:28 +0000
Subject: [PATCH] [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           |  2 +-
 tests/regressiontests/admin_scripts/tests.py | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/django/core/management/__init__.py b/django/core/management/__init__.py
index 85bf324fdc..bafab17112 100644
--- a/django/core/management/__init__.py
+++ b/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:
diff --git a/tests/regressiontests/admin_scripts/tests.py b/tests/regressiontests/admin_scripts/tests.py
index 2a7f3023c1..b3e826f74b 100644
--- a/tests/regressiontests/admin_scripts/tests.py
+++ b/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']