Merge 0819957 into 435081f

django/contrib/auth/hashers.py

@@ -1,6 +1,8 @@
 import hashlib
 
+from django.dispatch import receiver
 from django.conf import settings
+from django.test.signals import setting_changed
 from django.utils import importlib
 from django.utils.datastructures import SortedDict
 from django.utils.encoding import smart_str
@@ -14,6 +16,13 @@
 HASHERS = None  # lazily loaded from PASSWORD_HASHERS
 PREFERRED_HASHER = None  # defaults to first item in PASSWORD_HASHERS
 
+@receiver(setting_changed)
+def reset_hashers(**kwargs):
+    if kwargs['setting'] == 'PASSWORD_HASHERS':
+        global HASHERS, PREFERRED_HASHER
+        HASHERS = None
+        PREFERRED_HASHER = None
+
 
 def is_password_usable(encoded):
     return (encoded is not None and encoded != UNUSABLE_PASSWORD)

django/contrib/auth/tests/context_processors.py

@@ -13,6 +13,7 @@
             os.path.join(os.path.dirname(__file__), 'templates'),
         ),
     USE_TZ=False,                           # required for loading the fixture
+    PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',),
 )
 class AuthContextProcessorTests(TestCase):
     """

django/contrib/auth/tests/forms.py

@@ -11,7 +11,7 @@
 from django.utils.translation import ugettext as _
 
 
-@override_settings(USE_TZ=False)
+@override_settings(USE_TZ=False, PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class UserCreationFormTest(TestCase):
 
     fixtures = ['authtestdata.json']
@@ -77,7 +77,7 @@ def test_success(self):
         self.assertEqual(repr(u), '<User: jsmith@example.com>')
 
 
-@override_settings(USE_TZ=False)
+@override_settings(USE_TZ=False, PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class AuthenticationFormTest(TestCase):
 
     fixtures = ['authtestdata.json']
@@ -129,7 +129,7 @@ def test_success(self):
         self.assertEqual(form.non_field_errors(), [])
 
 
-@override_settings(USE_TZ=False)
+@override_settings(USE_TZ=False, PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class SetPasswordFormTest(TestCase):
 
     fixtures = ['authtestdata.json']
@@ -156,7 +156,7 @@ def test_success(self):
         self.assertTrue(form.is_valid())
 
 
-@override_settings(USE_TZ=False)
+@override_settings(USE_TZ=False, PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class PasswordChangeFormTest(TestCase):
 
     fixtures = ['authtestdata.json']
@@ -204,7 +204,7 @@ def test_field_order(self):
                          ['old_password', 'new_password1', 'new_password2'])
 
 
-@override_settings(USE_TZ=False)
+@override_settings(USE_TZ=False, PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class UserChangeFormTest(TestCase):
 
     fixtures = ['authtestdata.json']
@@ -251,7 +251,7 @@ def test_bug_17944_unknown_password_algorithm(self):
         form.as_table()
 
 
-@override_settings(USE_TZ=False)
+@override_settings(USE_TZ=False, PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class PasswordResetFormTest(TestCase):
 
     fixtures = ['authtestdata.json']

django/contrib/auth/tests/signals.py

@@ -3,7 +3,7 @@
 from django.contrib.auth import signals
 
 
-@override_settings(USE_TZ=False)
+@override_settings(USE_TZ=False, PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class SignalTestCase(TestCase):
     urls = 'django.contrib.auth.tests.urls'
     fixtures = ['authtestdata.json']

django/contrib/auth/tests/views.py

@@ -27,6 +27,7 @@
         os.path.join(os.path.dirname(__file__), 'templates'),
     ),
     USE_TZ=False,
+    PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',),
 )
 class AuthViewsTestCase(TestCase):
     """

tests/modeltests/test_client/models.py

@@ -25,10 +25,11 @@
 from django.conf import settings
 from django.core import mail
 from django.test import Client, TestCase, RequestFactory
+from django.test.utils import override_settings
 
 from .views import get_view
 
-
+@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class ClientTest(TestCase):
     fixtures = ['testdata.json']
 

tests/modeltests/timezones/tests.py

@@ -950,7 +950,8 @@ def test_model_form(self):
         self.assertEqual(e.dt, datetime.datetime(2011, 9, 1, 10, 20, 30, tzinfo=UTC))
 
 
-@override_settings(DATETIME_FORMAT='c', TIME_ZONE='Africa/Nairobi', USE_L10N=False, USE_TZ=True)
+@override_settings(DATETIME_FORMAT='c', TIME_ZONE='Africa/Nairobi', USE_L10N=False, USE_TZ=True,
+                  PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class AdminTests(TestCase):
 
     urls = 'modeltests.timezones.urls'

tests/regressiontests/admin_custom_urls/tests.py

@@ -3,10 +3,12 @@
 from django.core.urlresolvers import reverse
 from django.template.response import TemplateResponse
 from django.test import TestCase
+from django.test.utils import override_settings
 
 from .models import Action
 
 
+@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class AdminCustomUrlsTest(TestCase):
     fixtures = ['users.json', 'actions.json']
 

tests/regressiontests/admin_inlines/tests.py

@@ -5,6 +5,7 @@
 from django.contrib.auth.models import User, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
+from django.test.utils import override_settings
 
 # local test models
 from .admin import InnerInline
@@ -13,6 +14,7 @@
     ProfileCollection)
 
 
+@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class TestInline(TestCase):
     urls = "regressiontests.admin_inlines.urls"
     fixtures = ['admin-views-users.xml']
@@ -145,6 +147,7 @@ def test_non_related_name_inline(self):
                 '<input id="id_-2-0-name" type="text" class="vTextField" '
                 'name="-2-0-name" maxlength="100" />', html=True)
 
+@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class TestInlineMedia(TestCase):
     urls = "regressiontests.admin_inlines.urls"
     fixtures = ['admin-views-users.xml']
@@ -384,6 +387,7 @@ def test_inline_change_fk_all_perms(self):
         self.assertContains(response, 'id="id_inner2_set-0-DELETE"')
 
 
+@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class SeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
     webdriver_class = 'selenium.webdriver.firefox.webdriver.WebDriver'
     fixtures = ['admin-views-users.xml']
@@ -502,4 +506,4 @@ class SeleniumChromeTests(SeleniumFirefoxTests):
     webdriver_class = 'selenium.webdriver.chrome.webdriver.WebDriver'
 
 class SeleniumIETests(SeleniumFirefoxTests):
-    webdriver_class = 'selenium.webdriver.ie.webdriver.WebDriver'
+    webdriver_class = 'selenium.webdriver.ie.webdriver.WebDriver'