From 89c8c2e8311bd31b79c0829055d1e494ab88b801 Mon Sep 17 00:00:00 2001 From: Nick Pope Date: Thu, 27 Jul 2023 09:40:42 +0100 Subject: [PATCH] Simplified call_command() calls. --- django/core/management/commands/testserver.py | 2 +- django/test/testcases.py | 9 +++------ docs/ref/django-admin.txt | 2 +- tests/user_commands/tests.py | 5 +++-- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/django/core/management/commands/testserver.py b/django/core/management/commands/testserver.py index caff6c65cdc49..a8a03764c9931 100644 --- a/django/core/management/commands/testserver.py +++ b/django/core/management/commands/testserver.py @@ -45,7 +45,7 @@ def handle(self, *fixture_labels, **options): ) # Import the fixture data into the test database. - call_command("loaddata", *fixture_labels, **{"verbosity": verbosity}) + call_command("loaddata", *fixture_labels, verbosity=verbosity) # Run the development server. Turn off auto-reloading because it causes # a strange error -- it causes this handle() method to be called diff --git a/django/test/testcases.py b/django/test/testcases.py index 6c4a5b005a275..ac1996d97b2af 100644 --- a/django/test/testcases.py +++ b/django/test/testcases.py @@ -1085,11 +1085,7 @@ def _fixture_setup(self): apps.set_available_apps(self.available_apps) if self.fixtures: - # We have to use this slightly awkward syntax due to the fact - # that we're using *args and **kwargs together. - call_command( - "loaddata", *self.fixtures, **{"verbosity": 0, "database": db_name} - ) + call_command("loaddata", *self.fixtures, verbosity=0, database=db_name) def _should_reload_connections(self): return True @@ -1282,7 +1278,8 @@ def setUpClass(cls): call_command( "loaddata", *cls.fixtures, - **{"verbosity": 0, "database": db_name}, + verbosity=0, + database=db_name, ) except Exception: cls._rollback_atomics(cls.cls_atomics) diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index 9e13db435a483..cc448055f47fa 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -2075,7 +2075,7 @@ Running management commands from your code .. function:: django.core.management.call_command(name, *args, **options) -To call a management command from code use ``call_command``. +To call a management command from code use ``call_command()``. ``name`` the name of the command to call or a command object. Passing the name is diff --git a/tests/user_commands/tests.py b/tests/user_commands/tests.py index 408108b5525ff..65e176620db10 100644 --- a/tests/user_commands/tests.py +++ b/tests/user_commands/tests.py @@ -351,7 +351,8 @@ def test_required_list_option(self): management.call_command( command, *args, - **{**kwargs, "stdout": out}, + **kwargs, + stdout=out, ) self.assertIn("foo_list=[1, 2]", out.getvalue()) @@ -378,7 +379,7 @@ def test_required_const_options(self): ) self.assertIn(expected_output, out.getvalue()) out.truncate(0) - management.call_command("required_constant_option", **{**args, "stdout": out}) + management.call_command("required_constant_option", **args, stdout=out) self.assertIn(expected_output, out.getvalue()) def test_subparser(self):