Improve naming of arguments for the management commands

src/oscar/management/commands/oscar_fork_app.py

@@ -7,14 +7,13 @@ from oscar.core import customisation
 
 
 class Command(BaseCommand):
-    args = '<app label> <destination folder>'
     help = (
         "Create a local version of one of Oscar's app so it can "
         "be customised")
 
     def add_arguments(self, parser):
-        parser.add_argument('<app label>')
-        parser.add_argument('<destination folder>')
+        parser.add_argument('app_label', help='The application to fork')
+        parser.add_argument('target_path', help='The path to copy the files to')
 
     def handle(self, *args, **options):
         # Use a stdout logger
@@ -23,7 +22,7 @@ class Command(BaseCommand):
         logger.addHandler(stream)
         logger.setLevel(logging.DEBUG)
 
-        app_label, folder_path = options['<app label>'], options['<destination folder>']
+        app_label, folder_path = options['app_label'], options['target_path']
         try:
             customisation.fork_app(app_label, folder_path, logger)
         except Exception as e:

src/oscar/management/commands/oscar_fork_statics.py

@@ -13,18 +13,14 @@ class Command(BaseCommand):
     Copy Oscar's statics into local project so they can be used as a base for
     styling a new site.
     """
-    args = '<destination folder>'
     help = "Copy Oscar's static files"
 
     def add_arguments(self, parser):
-        parser.add_argument(
-            '<destination folder>',
-            nargs='?',
-            default='static')
+        parser.add_argument('target_path', nargs='?', default='static')
 
     def handle(self, *args, **options):
         # Determine where to copy to
-        folder = options['<destination folder>']
+        folder = options['target_path']
         if not folder.startswith('/'):
             destination = os.path.join(os.getcwd(), folder)
         else:

src/oscar/management/commands/oscar_generate_email_content.py

@@ -8,25 +8,24 @@ Dispatcher = get_class('customer.utils', 'Dispatcher')
 
 
 class Command(BaseCommand):
-    args = '<communication_event_type> <order number>'
     help = 'For testing the content of order emails'
 
     def add_arguments(self, parser):
-        parser.add_argument('<communication_event_type>')
-        parser.add_argument('<order number>')
+        parser.add_argument('event_type', help='The CommunicationEventType')
+        parser.add_argument('order_number', help='The Order number')
 
     def handle(self, *args, **options):
         try:
-            order = Order.objects.get(number=options['<order number>'])
+            order = Order.objects.get(number=options['order_number'])
         except Order.DoesNotExist:
             raise CommandError(
-                "No order found with number %s" % options['<order number>'])
+                "No order found with number %s" % options['order_number'])
 
         ctx = {
             'order': order,
             'lines': order.lines.all(),
         }
         messages = CommunicationEventType.objects.get_and_render(
-            options['<communication_event_type>'], ctx)
+            options['event_type'], ctx)
         print("Subject: %s\nBody:\n\n%s\nBody HTML:\n\n%s" % (
             messages['subject'], messages['body'], messages['html']))

src/oscar/management/commands/oscar_import_catalogue.py

@@ -11,12 +11,12 @@ logger = logging.getLogger('oscar.catalogue.import')
 
 
 class Command(BaseCommand):
-    args = '/path/to/file1.csv /path/to/file2.csv ...'
     help = 'For creating product catalogues based on a CSV file'
 
     def add_arguments(self, parser):
-        parser.add_argument('/path/to/file.csv', nargs='+')
-
+        parser.add_argument(
+            'filename', nargs='+',
+            help='/path/to/file1.csv /path/to/file2.csv ...')
         parser.add_argument(
             '--flush',
             action='store_true',
@@ -34,7 +34,7 @@ class Command(BaseCommand):
         importer = CatalogueImporter(
             logger, delimiter=options.get('delimiter'),
             flush=options.get('flush'))
-        for file_path in options['/path/to/file.csv']:
+        for file_path in options['filename']:
             logger.info(" - Importing records from '%s'" % file_path)
             try:
                 importer.handle(file_path)

src/oscar/management/commands/oscar_import_catalogue_images.py

@@ -10,11 +10,10 @@ logger = logging.getLogger('oscar.catalogue.import')
 
 
 class Command(BaseCommand):
-    args = '/path/to/folder'
     help = 'For importing product images from a folder'
 
     def add_arguments(self, parser):
-        parser.add_argument('/path/to/folder')
+        parser.add_argument('path', help='/path/to/folder')
 
         parser.add_argument(
             '--filename',
@@ -23,10 +22,7 @@ class Command(BaseCommand):
             help='Product field to lookup from image filename')
 
     def handle(self, *args, **options):
-        # if len(args) != 1:
-        #     raise CommandError('Command requires a path to a single folder')
-
         logger.info("Starting image import")
-        dirname = options['/path/to/folder']
+        dirname = options['path']
         importer = Importer(logger, field=options.get('filename'))
         importer.handle(dirname)