Ticket #17945: django-tests.patch

django/contrib/auth/tests/forms.py

@@ -303 +303 @@
         form = PasswordResetForm(data)
         self.assertFalse(form.is_valid())
         self.assertEqual(form["email"].errors,
-                         [u"The user account associated with this e-mail address cannot reset the password."])
+                         [PasswordResetForm.error_messages['unusable']])

django/contrib/auth/tests/views.py

@@ -11 +11 @@
 from django.http import QueryDict
 from django.utils.encoding import force_unicode
 from django.utils.html import escape
+from django.template import loader
 from django.test import TestCase
 
 from django.contrib.auth import SESSION_KEY, REDIRECT_FIELD_NAME
@@ -34 +35 @@
         settings.TEMPLATE_DIRS = (
             os.path.join(os.path.dirname(__file__), 'templates'),
         )
+        self.old_TEMPLATE_LOADERS = settings.TEMPLATE_LOADERS
+        settings.TEMPLATE_LOADERS = ('django.template.loaders.filesystem.Loader',
+                                     'django.template.loaders.app_directories.Loader')
+        loader.template_source_loaders = None #Flushing loader cache
 
     def tearDown(self):
         settings.LANGUAGES = self.old_LANGUAGES
         settings.LANGUAGE_CODE = self.old_LANGUAGE_CODE
         settings.TEMPLATE_DIRS = self.old_TEMPLATE_DIRS
+        settings.TEMPLATE_LOADERS = self.old_TEMPLATE_LOADERS
+        loader.template_source_loaders = None #Flushing loader cache
 
     def login(self, password='password'):
         response = self.client.post('/login/', {

django/core/management/base.py

@@ -247 +247 @@
             else:
                 self.stderr.write(smart_str(self.style.ERROR('Error: %s\n' % e)))
             sys.exit(1)
-        if saved_lang is not None:
-            translation.activate(saved_lang)
+        finally:
+            if saved_lang is not None:
+                translation.activate(saved_lang)
 
     def validate(self, app=None, display_num_errors=False):
         """