Ticket #7972: argvorder.diff

django/core/management/base.py

@@ -70 +70 @@
         parser = self.create_parser(prog_name, subcommand)
         parser.print_help()
 
-    def run_from_argv(self, argv):
-        parser = self.create_parser(argv[0], argv[1])
-        options, args = parser.parse_args(argv[2:])
+    def run_from_argv(self, prog_name, subcommand, argv):
+        parser = self.create_parser(prog_name, subcommand)
+        options, args = parser.parse_args(argv)
         handle_default_options(options)
-        self.execute(*args, **options.__dict__)
+        prog_args = args[2:]
+        self.execute(*prog_args, **options.__dict__)
 
     def execute(self, *args, **options):
         # Switch to English, because django-admin.py creates database content

django/core/management/__init__.py

@@ -226 +226 @@
             pass # Ignore any option errors at this point.
 
         try:
-            subcommand = self.argv[1]
+            subcommand = args[1]
         except IndexError:
             sys.stderr.write("Type '%s help' for usage.\n" % self.prog_name)
             sys.exit(1)
@@ -245 +245 @@
         elif self.argv[1:] == ['--help']:
             sys.stderr.write(self.main_help_text() + '\n')
         else:
-            self.fetch_command(subcommand).run_from_argv(self.argv)
+            self.fetch_command(subcommand).run_from_argv(args[0], args[1], sys.argv)
 
 class ProjectManagementUtility(ManagementUtility):
     """

tests/regressiontests/admin_scripts/tests.py

@@ -910 +910 @@
         self.assertNoOutput(err)
         self.assertOutput(out, "EXECUTE:BaseCommand labels=('testlabel',), options=[('option_a', 'x'), ('option_b', 'y'), ('option_c', '3'), ('pythonpath', None), ('settings', 'alternate_settings'), ('traceback', None)]")
 
+    def test_setting_then_command_then_label_then_options(self):
+        "Options are correctly handled when they are passed before and after a setting"
+        args = ['--settings=alternate_settings','base_command','testlabel','--option_a=x','--option_b=y']
+        out, err = self.run_manage(args)
+        self.assertNoOutput(err)
+        self.assertOutput(out, "EXECUTE:BaseCommand labels=('testlabel',), options=[('option_a', 'x'), ('option_b', 'y'), ('option_c', '3'), ('pythonpath', None), ('settings', 'alternate_settings'), ('traceback', None)]")
+