summaryrefslogtreecommitdiff
path: root/docs/internals
diff options
context:
space:
mode:
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 795e46f8f0..31ec014335 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -318,6 +318,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