Commit 8d98e70e authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

Promoted --verbosity to be a top level option for all management commands.... 

Promoted --verbosity to be a top level option for all management commands. Also added -v as a consistent short form of --verbosity. This is mostly to save Malcolm's poor arthritic fingers.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9110 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 2d3712f9

django/core/management/base.py

+4 −1
Original line number Diff line number Diff line
@@ -121,6 +121,9 @@ class BaseCommand(object): 
    """

    # Metadata about this command.

    option_list = (

        make_option('-v', '--verbosity', action='store', dest='verbosity', default='1',

            type='choice', choices=['0', '1', '2'],

            help='Verbosity level; 0=minimal output, 1=normal output, 2=all output'),

        make_option('--settings',

            help='The Python path to a settings module, e.g. "myproject.settings.main". If this isn\'t provided, the DJANGO_SETTINGS_MODULE environment variable will be used.'),

        make_option('--pythonpath',

django/core/management/commands/flush.py

+0 −3
Original line number Diff line number Diff line
@@ -4,9 +4,6 @@ from optparse import make_option 


class Command(NoArgsCommand):

    option_list = NoArgsCommand.option_list + (

        make_option('--verbosity', action='store', dest='verbosity', default='1',

            type='choice', choices=['0', '1', '2'],

            help='Verbosity level; 0=minimal output, 1=normal output, 2=all output'),

        make_option('--noinput', action='store_false', dest='interactive', default=True,

            help='Tells Django to NOT prompt the user for input of any kind.'),

    )

django/core/management/commands/loaddata.py

+7 −12
Original line number Diff line number Diff line
@@ -10,11 +10,6 @@ except NameError: 
    from sets import Set as set   # Python 2.3 fallback



class Command(BaseCommand):

    option_list = BaseCommand.option_list + (

        make_option('--verbosity', action='store', dest='verbosity', default='1',

            type='choice', choices=['0', '1', '2'],

            help='Verbosity level; 0=minimal output, 1=normal output, 2=all output'),

    )

    help = 'Installs the named fixture(s) in the database.'

    args = "fixture [fixture ...]"

django/core/management/commands/makemessages.py

+0 −3
Original line number Diff line number Diff line
@@ -170,9 +170,6 @@ class Command(BaseCommand): 
            help='Creates or updates the message files only for the given locale (e.g. pt_BR).'),

        make_option('--domain', '-d', default='django', dest='domain',

            help='The domain of the message files (default: "django").'),

        make_option('--verbosity', '-v', action='store', dest='verbosity',

            default='1', type='choice', choices=['0', '1', '2'],

            help='Verbosity level; 0=minimal output, 1=normal output, 2=all output'),

        make_option('--all', '-a', action='store_true', dest='all',

            default=False, help='Reexamines all source code and templates for new translation strings and updates all message files for all available languages.'),

        make_option('--extension', '-e', dest='extensions',

django/core/management/commands/syncdb.py

+3 −6
Original line number Diff line number Diff line
@@ -10,9 +10,6 @@ except NameError: 


class Command(NoArgsCommand):

    option_list = NoArgsCommand.option_list + (

        make_option('--verbosity', action='store', dest='verbosity', default='1',

            type='choice', choices=['0', '1', '2'],

            help='Verbosity level; 0=minimal output, 1=normal output, 2=all output'),

        make_option('--noinput', action='store_false', dest='interactive', default=True,

            help='Tells Django to NOT prompt the user for input of any kind.'),

    )