Ticket #15561: 15561-1.diff

new file django/test/decorators.py

@@ +1 @@
+from django.test.utils import alter_django_settings, restore_django_settings
+from django.utils.functional import wraps
+
+
+def with_django_settings(**kwargs):
+    def decorator(test):
+        @wraps(test)
+        def decorated_test(self):
+            state = alter_django_settings(**kwargs)
+            try:
+                return test(self)
+            finally:
+                restore_django_settings(state)
+        return decorated_test
+    return decorator

django/test/utils.py

@@ -97 +97 @@
     del mail.outbox
 
 
+def alter_django_settings(**kwargs):
+    oldvalues = {}
+    nonexistant = []
+    for setting, newvalue in kwargs.iteritems():
+        try:
+            oldvalues[setting] = getattr(settings, setting)
+        except AttributeError:
+            nonexistant.append(setting)
+        setattr(settings, setting, newvalue)
+    return oldvalues, nonexistant
+
+
+def restore_django_settings(state):
+    oldvalues, nonexistant = state
+    for setting, oldvalue in oldvalues.iteritems():
+        setattr(settings, setting, oldvalue)
+    for setting in nonexistant:
+        delattr(settings, setting)
+
+
 def get_warnings_state():
     """
     Returns an object containing the state of the warnings module

tests/regressiontests/mail/tests.py

@@ -16 +16 @@
 from django.core.mail.backends import console, dummy, locmem, filebased, smtp
 from django.core.mail.message import BadHeaderError
 from django.test import TestCase
+from django.test.decorators import with_django_settings
+from django.test.utils import alter_django_settings, restore_django_settings
 from django.utils.translation import ugettext_lazy
-from django.utils.functional import wraps
-
-
-def alter_django_settings(**kwargs):
-    oldvalues = {}
-    nonexistant = []
-    for setting, newvalue in kwargs.iteritems():
-        try:
-            oldvalues[setting] = getattr(settings, setting)
-        except AttributeError:
-            nonexistant.append(setting)
-        setattr(settings, setting, newvalue)
-    return oldvalues, nonexistant
-
-
-def restore_django_settings(state):
-    oldvalues, nonexistant = state
-    for setting, oldvalue in oldvalues.iteritems():
-        setattr(settings, setting, oldvalue)
-    for setting in nonexistant:
-        delattr(settings, setting)
-
-
-def with_django_settings(**kwargs):
-    def decorator(test):
-        @wraps(test)
-        def decorated_test(self):
-            state = alter_django_settings(**kwargs)
-            try:
-                return test(self)
-            finally:
-                restore_django_settings(state)
-        return decorated_test
-    return decorator
 
 
 class MailTests(TestCase):