Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Change the lack of supports_inactive_user on an auth backend to a

!PendingDeprecationWarning (refs #14249), fixing some bad links in the
1.3 release docs and a typo.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15204 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit faa4a98f27085e2f6e8e741fb641b084333abdca 1 parent 92d4352
Chris Beaven authored January 14, 2011
2  django/contrib/auth/__init__.py
@@ -33,7 +33,7 @@ def load_backend(path):
33 33
 
34 34
     if not hasattr(cls, 'supports_inactive_user'):
35 35
         warn("Authentication backends without a `supports_inactive_user` attribute are deprecated. Please define it in %s." % cls,
36  
-             DeprecationWarning)
  36
+             PendingDeprecationWarning)
37 37
         cls.supports_inactive_user = False
38 38
     return cls()
39 39
 
8  docs/releases/1.3.txt
@@ -151,7 +151,7 @@ of the template and context that was provided by the view to compute
151 151
 the response. The final output of the response is not computed until
152 152
 it is needed, later in the response process.
153 153
 
154  
-For more details, see the :ref:`documentation </ref/template-response>`
  154
+For more details, see the :doc:`documentation </ref/template-response>`
155 155
 on the :class:`~django.template.TemplateResponse` class.
156 156
 
157 157
 Caching changes
@@ -172,8 +172,8 @@ prefixing <cache_key_prefixing>` and :ref:`transformation
172 172
 Lastly, support for pylibmc_ has been added to the memcached cache
173 173
 backend.
174 174
 
175  
-For more details, see the :ref:`documentation on
176  
-caching in Django<topics/cache>`.
  175
+For more details, see the :doc:`documentation on
  176
+caching in Django</topics/cache>`.
177 177
 
178 178
 .. _pylibmc: http://sendapatch.se/projects/pylibmc/
179 179
 
@@ -183,7 +183,7 @@ Permissions for inactive users
183 183
 If you provide a custom auth backend with ``supports_inactive_user`` set to
184 184
 ``True``, an inactive user model will check the backend for permissions.
185 185
 This is useful for further centralizing the permission handling. See the
186  
-:ref:`authentication docs <topics-auth>` for more details.
  186
+:doc:`authentication docs </topics/auth>` for more details.
187 187
 
188 188
 GeoDjango
189 189
 ~~~~~~~~~
2  docs/topics/auth.txt
@@ -1644,7 +1644,7 @@ Authorization for inactive users
1644 1644
 
1645 1645
 An inactive user is a one that is authenticated but has its attribute
1646 1646
 ``is_active`` set to ``False``. However this does not mean they are not
1647  
-authrozied to do anything. For example they are allowed to activate their
  1647
+authorized to do anything. For example they are allowed to activate their
1648 1648
 account.
1649 1649
 
1650 1650
 The support for anonymous users in the permission system allows for

0 notes on commit faa4a98

Please sign in to comment.
Something went wrong with that request. Please try again.