summaryrefslogtreecommitdiff
path: root/django/test/utils.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/test/utils.py')
-rw-r--r--django/test/utils.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/django/test/utils.py b/django/test/utils.py
index 0cec1a2309..1678bf0de4 100644
--- a/django/test/utils.py
+++ b/django/test/utils.py
@@ -423,8 +423,10 @@ class override_settings(TestContextDecorator):
test_func._overridden_settings = self.options
else:
# Duplicate dict to prevent subclasses from altering their parent.
- test_func._overridden_settings = dict(
- test_func._overridden_settings, **self.options)
+ test_func._overridden_settings = {
+ **test_func._overridden_settings,
+ **self.options,
+ }
def decorate_class(self, cls):
from django.test import SimpleTestCase