django-admin.py: -h option usage inconsistent with help output

[teubank]

The help text for django-admin.py shows -h as a valid option, but using -h produces an error message. (This discrepancy is admittedly a very minor, but unnecessary, bug.)

To reproduce:

$ django-admin -h 
Unknown command: '-h'
Type 'django-admin help' for usage.
$ django-admin help
...
  -h, --help            show this help message and exit
...

The attached patches for releases 1.1.X and 1.2.X modify django/trunk/django/core/management/__init__.py to accept -h as a valid option.

-        elif self.argv[1:] == ['--help']:
+        elif self.argv[1:] == ['--help'] or self.argv[1:] == ['-h']:

Note: Since the definition for the help option is buried in optparse.py, modifying django/core/management/__init__.py to accept -h seems to be preferable to changing the help option definition to reflect current usage.

[teubank]

svn diff for version 1.1.X

[teubank]

svn diff for version 1.2.X

[Russell Keith-Magee]

In [15605]:

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

[Russell Keith-Magee]

In [15609]:

[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.

[Jacob]

Milestone 1.3 deleted