Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #983 -- Made 'django-admin.py --help' output easier to read. Th…

…anks, Oliver

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1526 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 027c47b9b4f88f83ec06a968e3c9264e6f878f74 1 parent 2863e09
@adrianholovaty adrianholovaty authored
Showing with 6 additions and 3 deletions.
  1. +1 −0  AUTHORS
  2. +5 −3 django/bin/django-admin.py
View
1  AUTHORS
@@ -76,6 +76,7 @@ answer newbie questions, and generally made Django that much better:
Luke Plant <http://lukeplant.me.uk/>
phaedo <http://phaedo.cx/>
plisk
+ Oliver Rutherfurd <http://rutherfurd.net/>
David Schein
sopel
Radek Švarz <http://www.svarz.cz/translate/>
View
8 django/bin/django-admin.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
from django.core import management
from optparse import OptionParser
-import os, sys
+import os, sys, textwrap
ACTION_MAPPING = {
'adminindex': management.get_admin_index,
@@ -37,8 +37,10 @@ def get_usage():
available_actions.sort()
for a in available_actions:
func = ACTION_MAPPING[a]
- usage.append(" %s %s -- %s" % (a, func.args, getattr(func, 'help_doc', func.__doc__)))
- return '\n'.join(usage)
+ usage.append(" %s %s" % (a, func.args))
+ usage.extend(textwrap.wrap(getattr(func, 'help_doc', func.__doc__), initial_indent=' ', subsequent_indent=' '))
+ usage.append("")
+ return '\n'.join(usage[:-1]) # Cut off last list element, an empty space.
class DjangoOptionParser(OptionParser):
def print_usage_and_exit(self):
Please sign in to comment.
Something went wrong with that request. Please try again.