innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Set stacklevel for the override_settings warning. 

Refs #19031.
This commit is contained in:
Aymeric Augustin 2013-12-20 11:04:58 +01:00
parent 1b9cbef198
commit eabc3b6c8d
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/test/signals.py
View File

@ -97,4 +97,7 @@ def file_storage_changed(**kwargs):
@receiver(setting_changed) @receiver(setting_changed)
def complex_setting_changed(**kwargs): def complex_setting_changed(**kwargs):
if kwargs['enter'] and kwargs['setting'] in COMPLEX_OVERRIDE_SETTINGS: if kwargs['enter'] and kwargs['setting'] in COMPLEX_OVERRIDE_SETTINGS:
warnings.warn("Overriding setting %s can lead to unexpected behaviour." % kwargs['setting']) # Considering the current implementation of the signals framework,
# stacklevel=5 shows the line containing the override_settings call.
warnings.warn("Overriding setting %s can lead to unexpected behaviour."
% kwargs['setting'], stacklevel=5)

10
tests/settings_tests/tests.py
View File

@ -227,13 +227,13 @@ class TestComplexSettingOverride(TestCase):
with warnings.catch_warnings(record=True) as w: with warnings.catch_warnings(record=True) as w:
warnings.simplefilter("always") warnings.simplefilter("always")
override = override_settings(TEST_WARN='override') with override_settings(TEST_WARN='override'):
override.enable() self.assertEqual(settings.TEST_WARN, 'override')
self.assertEqual('override', settings.TEST_WARN)
override.disable()
self.assertEqual(len(w), 1) self.assertEqual(len(w), 1)
self.assertEqual('Overriding setting TEST_WARN can lead to unexpected behaviour.', str(w[-1].message)) self.assertEqual(w[0].filename, __file__)
self.assertEqual(str(w[0].message),
'Overriding setting TEST_WARN can lead to unexpected behaviour.')
class UniqueSettingsTests(TestCase): class UniqueSettingsTests(TestCase):