summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2018-03-21 20:02:18 -0400
committerTim Graham <timograham@gmail.com>2018-03-21 20:05:22 -0400
commit43348e4aa16834d0456e7c9f593e6c5e5447bcd3 (patch)
tree0f2565af36cd448903d84d848de84b1992db70c1
parent7f7bb1d1f4a4bad18ab4478099b9a7aa3dcfb62e (diff)
Reverted "[2.0.x] Expanded docs for AbstractBaseUser.has_usable_password()."
This reverts commit c2962d8147380b00bb965c0d42b7e05ca4596868. After discussion in refs #28718, the decision is to treat the reverted statements as bugs.
-rw-r--r--django/contrib/auth/base_user.py4
-rw-r--r--docs/ref/contrib/auth.txt4
2 files changed, 2 insertions, 6 deletions
diff --git a/django/contrib/auth/base_user.py b/django/contrib/auth/base_user.py
index a165677f4c..7e3161bd98 100644
--- a/django/contrib/auth/base_user.py
+++ b/django/contrib/auth/base_user.py
@@ -116,9 +116,7 @@ class AbstractBaseUser(models.Model):
def has_usable_password(self):
"""
- Return False if set_unusable_password() has been called for this user,
- or if the password is None, or if the password uses a hasher that's not
- in the PASSWORD_HASHERS setting.
+ Return False if set_unusable_password() has been called for this user.
"""
return is_password_usable(self.password)
diff --git a/docs/ref/contrib/auth.txt b/docs/ref/contrib/auth.txt
index a55ee4c675..b4b407272a 100644
--- a/docs/ref/contrib/auth.txt
+++ b/docs/ref/contrib/auth.txt
@@ -212,9 +212,7 @@ Methods
Returns ``False`` if
:meth:`~django.contrib.auth.models.User.set_unusable_password()` has
- been called for this user, or if the password is ``None``, or if the
- password uses a hasher that's not in the :setting:`PASSWORD_HASHERS`
- setting.
+ been called for this user.
.. method:: get_group_permissions(obj=None)