Ticket #10130: 10130-r11594.diff

django/utils/functional.py

@@ -281 +281 @@
                 self._setup()
             setattr(self._wrapped, name, value)
 
+    def __delattr__(self, name):
+        if name == "_wrapped":
+            raise AttributeError("Wrapped settings object cannot be deleted.")
+        else:
+            if self._wrapped is None:
+                self._setup()
+            delattr(self._wrapped, name)
+
     def _setup(self):
         """
         Must be implemented by subclasses to initialise the wrapped object.

tests/regressiontests/settings/tests.py

@@ +1 @@
+import unittest
+from django.conf import settings
+
+class SettingsTest(unittest.TestCase):
+
+    def test_set_delete(self):
+        settings.TEST = 'test'
+        self.assertEqual('test', settings.TEST)
+        del settings.TEST
+        self.assertRaises(AttributeError, lambda: settings.TEST)
+
+    def test_delete_wrapped(self):
+        def del_wrapped():
+            del settings._wrapped
+        self.assertRaises(AttributeError, del_wrapped)