summaryrefslogtreecommitdiff
path: root/docs/internals
diff options
context:
space:
mode:
authorAndrew Godwin <andrew@aeracode.org>2014-08-07 14:13:22 +1000
committerAndrew Godwin <andrew@aeracode.org>2014-08-07 14:15:44 +1000
commit9cc5d99bdeff5be0f8df1618b989050061ed5629 (patch)
tree55d8132c2bdd61d9aba3f83d0104059aa0878244 /docs/internals
parentb6a6033096685a5027a4aea5f92e2715ef481dbd (diff)
[1.7.x] Fixed #23252: Call out removed features in release notes.
Also added StrAndUnicode mixin note to deprecation plan as it was missing.
Diffstat (limited to 'docs/internals')
-rw-r--r--docs/internals/deprecation.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index 270c5d4040..6b73461cab 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -281,6 +281,10 @@ details on these changes.
not, then any password reset links generated before you upgrade to Django 1.7
won't work after the upgrade.
+* The ``django.utils.encoding.StrAndUnicode`` mix-in will be removed.
+ Define a ``__str__`` method and apply the
+ :func:`~django.utils.encoding.python_2_unicode_compatible` decorator instead.
+
.. _deprecation-removed-in-1.6:
1.6