Ticket #29295: 29295.diff

django/core/management/__init__.py

@@ -311 +311 @@
         # Preprocess options to extract --settings and --pythonpath.
         # These options could affect the commands that are available, so they
         # must be processed early.
-        parser = CommandParser(None, usage="%(prog)s subcommand [options] [args]", add_help=False)
+        parser = CommandParser(usage='%(prog)s subcommand [options] [args]', add_help=False)
         parser.add_argument('--settings')
         parser.add_argument('--pythonpath')
         parser.add_argument('args', nargs='*')  # catch-all

django/core/management/base.py

@@ -42 +42 @@
     SystemExit in several occasions, as SystemExit is unacceptable when a
     command is called programmatically.
     """
-    def __init__(self, cmd, **kwargs):
-        self.cmd = cmd
+    def __init__(self, **kwargs):
+        self.missing_args_message = kwargs.pop('missing_args_message', None)
+        self.called_from_command_line = kwargs.pop('called_from_command_line', None)
         super().__init__(**kwargs)
 
     def parse_args(self, args=None, namespace=None):
         # Catch missing argument for a better error message
-        if (hasattr(self.cmd, 'missing_args_message') and
+        if (self.missing_args_message and
                 not (args or any(not arg.startswith('-') for arg in args))):
-            self.error(self.cmd.missing_args_message)
+            self.error(self.missing_args_message)
         return super().parse_args(args, namespace)
 
     def error(self, message):
-        if self.cmd._called_from_command_line:
+        if self.called_from_command_line:
             super().error(message)
         else:
             raise CommandError("Error: %s" % message)
@@ -225 +226 @@
         parse the arguments to this command.
         """
         parser = CommandParser(
-            self, prog="%s %s" % (os.path.basename(prog_name), subcommand),
+            prog='%s %s' % (os.path.basename(prog_name), subcommand),
             description=self.help or None,
+            missing_args_message=getattr(self, 'missing_args_message', None),
+            called_from_command_line=getattr(self, '_called_from_command_line', None),
         )
+
         parser.add_argument('--version', action='version', version=self.get_version())
         parser.add_argument(
             '-v', '--verbosity', action='store', dest='verbosity', default=1,