diff options
| author | Nick Pope <nick@nickpope.me.uk> | 2023-07-27 09:40:42 +0100 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2023-07-27 15:48:47 +0200 |
| commit | 89c8c2e8311bd31b79c0829055d1e494ab88b801 (patch) | |
| tree | cf9259e2ab0c32e895e5084af0c9079cd36b3d56 | |
| parent | a564f44350afc4823b9ff6eb14c56e8793ed4b31 (diff) | |
Simplified call_command() calls.
| -rw-r--r-- | django/core/management/commands/testserver.py | 2 | ||||
| -rw-r--r-- | django/test/testcases.py | 9 | ||||
| -rw-r--r-- | docs/ref/django-admin.txt | 2 | ||||
| -rw-r--r-- | 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 caff6c65cd..a8a03764c9 100644 --- a/django/core/management/commands/testserver.py +++ b/django/core/management/commands/testserver.py @@ -45,7 +45,7 @@ class Command(BaseCommand): ) # 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 6c4a5b005a..ac1996d97b 100644 --- a/django/test/testcases.py +++ b/django/test/testcases.py @@ -1085,11 +1085,7 @@ class TransactionTestCase(SimpleTestCase): 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 @@ class TestCase(TransactionTestCase): 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 9e13db435a..cc448055f4 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 408108b552..65e176620d 100644 --- a/tests/user_commands/tests.py +++ b/tests/user_commands/tests.py @@ -351,7 +351,8 @@ class CommandTests(SimpleTestCase): management.call_command( command, *args, - **{**kwargs, "stdout": out}, + **kwargs, + stdout=out, ) self.assertIn("foo_list=[1, 2]", out.getvalue()) @@ -378,7 +379,7 @@ class CommandTests(SimpleTestCase): ) 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): |