Ticket #16507: 16507.4.diff

django/contrib/messages/tests/base.py

@@ -1 +1 @@
 from django import http
-from django.conf import settings
+from django.conf import settings, urls as urlhandlers
 from django.contrib.messages import constants, utils, get_level, set_level
 from django.contrib.messages.api import MessageFailure
 from django.contrib.messages.storage import default_storage, base
@@ -56 +56 @@
 
     def setUp(self):
         self.settings_override = override_settings_tags(
-            TEMPLATE_DIRS   = (),
+            TEMPLATE_LOADERS = (),
             MESSAGE_TAGS    = '',
             MESSAGE_STORAGE = '%s.%s' % (self.storage_class.__module__,
                                          self.storage_class.__name__),
         )
         self.settings_override.enable()
+        self.old_handler500 = urlhandlers.handler500
+        urlhandlers.handler500 = 'django.views.defaults.server_error'
 
     def tearDown(self):
         self.settings_override.disable()
+        urlhandlers.handler500 = self.old_handler500
 
     def get_request(self):
         return http.HttpRequest()