Django

Code

Changeset 1526

Show
Ignore:
Timestamp:
12/02/05 14:58:35 (4 years ago)
Author:
adrian
Message:

Fixed #983 -- Made 'django-admin.py --help' output easier to read. Thanks, Oliver

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/trunk/AUTHORS

    r1521 r1526  
    7777    phaedo <http://phaedo.cx/> 
    7878    plisk 
     79    Oliver Rutherfurd <http://rutherfurd.net/> 
    7980    David Schein 
    8081    sopel 
  • django/trunk/django/bin/django-admin.py

    r1477 r1526  
    22from django.core import management 
    33from optparse import OptionParser 
    4 import os, sys 
     4import os, sys, textwrap 
    55 
    66ACTION_MAPPING = { 
     
    3838    for a in available_actions: 
    3939        func = ACTION_MAPPING[a] 
    40         usage.append("  %s %s -- %s" % (a, func.args, getattr(func, 'help_doc', func.__doc__))) 
    41     return '\n'.join(usage) 
     40        usage.append("  %s %s" % (a, func.args)) 
     41        usage.extend(textwrap.wrap(getattr(func, 'help_doc', func.__doc__), initial_indent='    ', subsequent_indent='    ')) 
     42        usage.append("") 
     43    return '\n'.join(usage[:-1]) # Cut off last list element, an empty space. 
    4244 
    4345class DjangoOptionParser(OptionParser):