  We've provided conversion functions that will transparently
  convert functions adhering to the old prototype into functions
  compatible with the new prototype. However, these conversion functions
  will be removed in Django 1.4, so you should upgrade your ``Field``
  definitions to use the new prototype now, just to get it over with.
  
  If your ``get_db_prep_*()`` methods made no use of the database
  connection, you should be able to upgrade by renaming
  ``get_db_prep_value()`` to ``get_prep_value()`` and
  ``get_db_prep_lookup()`` to ``get_prep_lookup()`. If you require
 
</s> remove Prior to 1.2, a custom ``Field`` had the option of defining several
functions to support conversion of Python values into
 </s> add Prior to Django 1.2, a custom ``Field`` had the option of defining
several functions to support conversion of Python values into </s> remove ``django.contrib.auth.decorators`` provides the decorators ``login_required``,
``permission_required`` and ``user_passes_test``. Previously it was possible to
use these decorators both on functions (where the first argument is 'request')
and on methods (where the first argument is 'self', and the second argument is
'request'). However, we have found that the trick which enabled this is
flawed. It only works in limited circumstances, and produces errors that are
very difficult to debug when it does not work.

For this reason, the 'auto adapt' behaviour has been removed, and if you are
using these decorators on methods, you will need to manually apply
:func:`django.utils.decorators.method_decorator` to convert the decorator to one
that works with methods. You would change code from this::
 </s> add ``django.contrib.auth.decorators`` provides the decorators
``login_required``, ``permission_required`` and
``user_passes_test``. Previously it was possible to use these
decorators both on functions (where the first argument is 'request')
and on methods (where the first argument is 'self', and the second
argument is 'request'). Unfortunately, flaws were discovered in the
code supporting this: it only works in limited circumstances, and
produces errors that are very difficult to debug when it does not
work.

For this reason, the 'auto adapt' behavior has been removed, and if
you are using these decorators on methods, you will need to manually
apply :func:`django.utils.decorators.method_decorator` to convert the
decorator to one that works with methods. For example, you would
change code from this:: </s> remove    requires the use of the csrf_token template tag in the template. If you
 </s> add    requires the use of the ``csrf_token`` template tag in the template. If you </s> remove  * All of the CSRF has moved from contrib to core (with backwards compatible
   imports in the old locations, which are deprecated).
 </s> add  * All of the CSRF has moved from contrib to core (with backwards
   compatible imports in the old locations, which are deprecated and
   will cease to be supported in Django 1.4). </s> remove iterating over __dict__ to obtain a list of fields, you must now
filter the ``_state`` attribute out of ``__dict__``.
 </s> add iterating over ``__dict__`` to obtain a list of fields, you must now
be prepared to handle or filter out the ``_state`` attribute.
definitions to use the new prototype as soon as possible.
  We've provided conversion functions that will transparently
  convert functions adhering to the old prototype into functions
  compatible with the new prototype. However, these conversion functions
  will be removed in Django 1.4, so you should upgrade your ``Field``
definitions to use the new prototype as soon as possible.
  
  If your ``get_db_prep_*()`` methods made no use of the database
  connection, you should be able to upgrade by renaming
  ``get_db_prep_value()`` to ``get_prep_value()`` and
  ``get_db_prep_lookup()`` to ``get_prep_lookup()`. If you require
keep keep keep keep replace keep keep keep keep keep
 Update 1.2 release notes in anticipation of final release.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13259 bcc190cf-cafb-0310-a4f2-bffc1f526a37 
docs/releases/1.2.txt