From 723b5747933f8519708a1b75e1c01478151dec33 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Sun, 10 Jul 2011 19:35:05 +0000 Subject: [PATCH] Fixed #16447 -- Stopped using the setting name as the sender parameter for the setting_changed signal. Thanks, Alex Gaynor. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16530 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/test/utils.py | 2 +- docs/ref/signals.txt | 2 +- tests/regressiontests/settings_tests/tests.py | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/django/test/utils.py b/django/test/utils.py index 19a3190166..7a110da0b3 100644 --- a/django/test/utils.py +++ b/django/test/utils.py @@ -177,7 +177,7 @@ class OverrideSettingsHolder(UserSettingsHolder): """ def __setattr__(self, name, value): UserSettingsHolder.__setattr__(self, name, value) - setting_changed.send(sender=name, setting=name, value=value) + setting_changed.send(sender=self.__class__, setting=name, value=value) class override_settings(object): diff --git a/docs/ref/signals.txt b/docs/ref/signals.txt index 4e1f7e2967..b265d078eb 100644 --- a/docs/ref/signals.txt +++ b/docs/ref/signals.txt @@ -487,7 +487,7 @@ Sent when some :ref:`settings are overridden ` with the Arguments sent with this signal: ``sender`` - The setting name (string). + The settings handler. ``setting`` Same as sender diff --git a/tests/regressiontests/settings_tests/tests.py b/tests/regressiontests/settings_tests/tests.py index ad42e1a5f2..369ab30aa4 100644 --- a/tests/regressiontests/settings_tests/tests.py +++ b/tests/regressiontests/settings_tests/tests.py @@ -24,10 +24,11 @@ class SettingGetter(object): testvalue = None def signal_callback(sender, setting, value, **kwargs): - global testvalue - testvalue = value + if setting == 'TEST': + global testvalue + testvalue = value -signals.setting_changed.connect(signal_callback, sender='TEST') +signals.setting_changed.connect(signal_callback) class SettingsTests(TestCase):