diff options
| author | Tim Graham <timograham@gmail.com> | 2017-02-11 13:39:35 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2019-04-07 20:03:54 -0400 |
| commit | fb2b4253f93a85e21ee6bac4ecdac52929faeb2f (patch) | |
| tree | ad7d9fb940ed9d69a90b0af1896ec66ea05272f1 | |
| parent | 0a8617a5b1cac7063f30e4d8ff4ea4c30748f7b8 (diff) | |
[2.1.x] Refs #27807 -- Removed docs for User.username_validator.
The new override functionality claimed in refs #21379 doesn't work.
Forwardport of 714fdbaa7048c2321f6238d9421137c33d9af7cc from stable/1.10.x.
| -rw-r--r-- | docs/ref/contrib/auth.txt | 21 | ||||
| -rw-r--r-- | docs/releases/1.10.txt | 9 |
2 files changed, 5 insertions, 25 deletions
diff --git a/docs/ref/contrib/auth.txt b/docs/ref/contrib/auth.txt index b6a2d60f9d..721ddff27b 100644 --- a/docs/ref/contrib/auth.txt +++ b/docs/ref/contrib/auth.txt @@ -38,8 +38,7 @@ Fields usernames. Although it wasn't a deliberate choice, Unicode characters have always been accepted when using Python 3. Django 1.10 officially added Unicode support in usernames, keeping the - ASCII-only behavior on Python 2, with the option to customize the - behavior using :attr:`.User.username_validator`. + ASCII-only behavior on Python 2. .. attribute:: first_name @@ -141,24 +140,6 @@ Attributes :attr:`~django.contrib.auth.models.User.is_authenticated` to this attribute. - .. attribute:: username_validator - - Points to a validator instance used to validate usernames. Defaults to - :class:`validators.UnicodeUsernameValidator`. - - To change the default username validator, you can subclass the ``User`` - model and set this attribute to a different validator instance. For - example, to use ASCII usernames:: - - from django.contrib.auth.models import User - from django.contrib.auth.validators import ASCIIUsernameValidator - - class CustomUser(User): - username_validator = ASCIIUsernameValidator() - - class Meta: - proxy = True # If no new field is added. - Methods ------- diff --git a/docs/releases/1.10.txt b/docs/releases/1.10.txt index ccf791c856..a5193179ac 100644 --- a/docs/releases/1.10.txt +++ b/docs/releases/1.10.txt @@ -60,12 +60,11 @@ wasn't a deliberate choice, Unicode characters have always been accepted when using Python 3. The username validator now explicitly accepts Unicode characters by -default on Python 3 only. This default behavior can be overridden by changing -the :attr:`~django.contrib.auth.models.User.username_validator` attribute of -the ``User`` model, or to any proxy of that model, using either +default on Python 3 only. + +Custom user models may use the new :class:`~django.contrib.auth.validators.ASCIIUsernameValidator` or -:class:`~django.contrib.auth.validators.UnicodeUsernameValidator`. Custom user -models may also use those validators. +:class:`~django.contrib.auth.validators.UnicodeUsernameValidator`. Minor features -------------- |