This patch is the result of the work of many people, over many years.
To try and thank individuals would inevitably lead to many people
being left out or forgotten -- so rather than try to give a list that
will inevitably be incomplete, I'd like to thank *everybody* who
contributed in any way, big or small, with coding, testing, feedback
and/or documentation over the multi-year process of getting this into
trunk.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14254 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14253 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Tests are placed in the test suite and not the contrib app since they require
models to work

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14251 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #12074 -- Adding .as_p and as_ul methods to FormSet. Thanks arthurdebert and dpn for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14250 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14249 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Clarify in the documentation that we occasionally add APIs for newer Python versions.  Thanks to Russell, Jannis, and Carl for help with the language.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14248 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #13963 -- Use the correct verbose name of a reverse relation field in the admin. Thanks, sfllaw and d0ugal.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14244 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Corrected the skipIfDBFeature and skipUnlessDBFeature decorators to actually *run* the tests they decorate. Thanks to Alex for the report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14243 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14241 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #14126 -- Fixed an issue with changes to the blocktrans tag introduced in r13967 related to multiple plural forms. Thanks, mark0978, svetlyak40wt and Ramiro.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14239 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14238 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Converted or_lookups tests from doctests to unittests.  We have always been at war with doctests.  Thanks to Paul Tax for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14236 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #14307 -- Added a new crossref target to model field reference docs and fixed broken relative link in form field reference docs. Thanks to adamv for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14234 bcc190cf-cafb-0310-a4f2-bffc1f526a37

sha_constructor was incorrectly used instead of sha_hmac (which only made a
difference under 2.4).

Thanks to Steffan Kaminski for report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14233 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #14307 -- Linked ChoiceField.choices docs to Field.choices docs to explain the formatting options available. Thanks to adamv for the report and Russ for the suggested fix.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14231 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #14376 -- added docs for previously undocumented Brazilian localflavor fields. Thanks to henriquebastos for the report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14229 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #14473 -- converted the model_package tests from doctests to unitests.  We have always been at war with doctests.  Thanks to Gabriel Hurley for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14227 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #14472 -- converted generic_relations tests from doctests to unitests.  We have always been at war with doctests.  Thanks to Gabriel Hurley for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14225 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14224 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #11350 -- added an Israeli localflavor.  Thanks to Yuval and Idan Gazit for their work on the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14223 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #14454 -- converted admin_widgets tests from doctests to unittests.  We have always been at war with doctests.  Thanks to prestontimmons for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14221 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Change the stacklevel for Field deprecation warnings to correctly point to the source of the problem

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14220 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fix the version which the safe argument for the urlencode filter was added. Thanks eternicode for pointing this out.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14219 bcc190cf-cafb-0310-a4f2-bffc1f526a37

All adhoc MAC applications have been updated to use HMAC, using SHA1 to
generate unique keys for each application based on the SECRET_KEY, which is
common practice for this situation. In all cases, backwards compatibility
with existing hashes has been maintained, aiming to phase this out as per
the normal deprecation process. In this way, under most normal
circumstances the old hashes will have expired (e.g. by session expiration
etc.) before they become invalid.

In the case of the messages framework and the cookie backend, which was
already using HMAC, there is the possibility of a backwards incompatibility
if the SECRET_KEY is shorter than the default 50 bytes, but the low
likelihood and low impact meant compatibility code was not worth it.

All known instances where tokens/hashes were compared using simple string
equality, which could potentially open timing based attacks, have also been
fixed using a constant-time comparison function.

There are no known practical attacks against the existing implementations,
so these security improvements will not be backported.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14218 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #14301 -- Handle email validation gracefully with email addresses containing non-ASCII characters. Thanks, Andi Albrecht.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14216 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #5327 -- Added standardized field information to ModelChoiceField and ModelMultipleChoiceField documentation. Thanks to danielrubio for the report and PhiR for the text.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14214 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #14456 -- converted inline_formsets tests from doctests to unittests.  We have always been at war with doctests.  Thanks to prestontimmons for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14212 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #14459 -- converted many_to_one_regress tests from doctests to unittests.  We have always been at war with doctests.  Patch from Gabriel Hurley.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14210 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14209 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #14460 -- converted managers_regress tests from doctests to unittests.  We have always been at war with doctests.  Patch from Gabriel Hurley.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14207 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #14458 -- converted m2m_regress tests from doctests to unittests.  We have always been at war with doctests.  Thanks to Gabriel Hurley for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14205 bcc190cf-cafb-0310-a4f2-bffc1f526a37

will result in use of LIMIT 0. Thanks Suor for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14204 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14203 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14202 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14200 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #14119 -- fields_for_model no longer returns all fields when fields parameter is the empty tuple. Thanks alexdutton!

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14199 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #12304 -- regression tests to make sure the validation messages for unique violations are sane, Thanks ramiro!

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14198 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Also added a transaction around the deletion view to preserve DB state (and rollback the creation of LogEntry object in case the deletion fails)

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14197 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14195 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #13811 -- Changed unique validation in model formsets to ignore None values, not just omit them

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14193 bcc190cf-cafb-0310-a4f2-bffc1f526a37