mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #20290 -- Allow override_settings to be nested

Browse Source 
Refactored override_settings to store the underlying settings._wrapped
value seen at runtime, not instantiation time.
This commit is contained in:
Oliver Beattie
2013-04-19 10:44:47 +01:00
committed by Claude Paroz
parent 7314007c5b
commit 552a90b444
4 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
django/test/utils.py
View File

@@ -207,7 +207,6 @@ class override_settings(object):
"""
def __init__(self, **kwargs):
self.options = kwargs
self.wrapped = settings._wrapped
def __enter__(self):
self.enable()
@@ -246,6 +245,7 @@ class override_settings(object):
override = UserSettingsHolder(settings._wrapped)
for key, new_value in self.options.items():
setattr(override, key, new_value)
self.wrapped = settings._wrapped
settings._wrapped = override
for key, new_value in self.options.items():
setting_changed.send(sender=settings._wrapped.__class__,
@@ -253,6 +253,7 @@ class override_settings(object):
def disable(self):
settings._wrapped = self.wrapped
del self.wrapped
for key in self.options:
new_value = getattr(settings, key, None)
setting_changed.send(sender=settings._wrapped.__class__,