Ticket #18038: 18038-wip.patch

docs/topics/auth.txt

@@ -1840 +1840 @@
         ADMIN_PASSWORD = 'sha1$4e987$afbcf42e21bd417fb71db8c66b321e9fc33051de'
         """
 
-        supports_inactive_user = False
-
         def authenticate(self, username=None, password=None):
             login_valid = (settings.ADMIN_LOGIN == username)
             pwd_valid = check_password(password, settings.ADMIN_PASSWORD)
@@ -1940 +1938 @@
 anonymous users to have permissions to do something while inactive
 authenticated users do not.
 
-To enable this on your own backend, you must set the class attribute
-``supports_inactive_user`` to ``True``.
 
-A nonexisting ``supports_inactive_user`` attribute will raise a
-``PendingDeprecationWarning`` if used in Django 1.3. In Django 1.4, this
-warning will be updated to a ``DeprecationWarning`` which will be displayed
-loudly. Additionally ``supports_inactive_user`` will be set to ``False``.
-Django 1.5 will assume that every backend supports inactive users being
-passed to the authorization methods.
-
-
 Handling object permissions
 ---------------------------
 

django/contrib/auth/__init__.py

@@ -1 @@
-from warnings import warn
 from django.core.exceptions import ImproperlyConfigured
 from django.utils.importlib import import_module
 from django.contrib.auth.signals import user_logged_in, user_logged_out
@@ -21 +20 @@
     except AttributeError:
         raise ImproperlyConfigured('Module "%s" does not define a "%s" authentication backend' % (module, attr))
 
-    if not hasattr(cls, 'supports_inactive_user'):
-        warn("Authentication backends without a `supports_inactive_user` attribute are deprecated. Please define it in %s." % cls,
-             DeprecationWarning)
-        cls.supports_inactive_user = False
     return cls()
 
 def get_backends():

django/contrib/auth/backends.py

@@ -5 +5 @@
     """
     Authenticates against django.contrib.auth.models.User.
     """
-    supports_inactive_user = True
 
     # TODO: Model, login attribute name and password attribute name should be
     # configurable.

django/contrib/auth/models.py

@@ -200 +200 @@
     anon = user.is_anonymous()
     active = user.is_active
     for backend in auth.get_backends():
-        if anon or active or backend.supports_inactive_user:
+        if anon or active:
             if hasattr(backend, "has_perm"):
                 if obj is not None:
                     if backend.has_perm(user, perm, obj):
@@ -215 +215 @@
     anon = user.is_anonymous()
     active = user.is_active
     for backend in auth.get_backends():
-        if anon or active or backend.supports_inactive_user:
+        if anon or active:
             if hasattr(backend, "has_module_perms"):
                 if backend.has_module_perms(user, app_label):
                     return True