diff options
| author | Ramiro Morales <cramm0@gmail.com> | 2013-06-28 23:05:00 -0300 |
|---|---|---|
| committer | Ramiro Morales <cramm0@gmail.com> | 2013-06-28 23:16:28 -0300 |
| commit | 24bbf1367a1eed9443571622ab74c2c3e3d3db11 (patch) | |
| tree | 0767a79ac536250c6997dde49cf44dfbaaafdef8 /docs | |
| parent | 425a4292083c7355a2a4ef9676f605a9c3b8fe70 (diff) | |
Removed django.utils.encoding.StrAndUnicode class, deprecated in Django 1.5.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/utils.txt | 13 | ||||
| -rw-r--r-- | docs/releases/1.5-alpha-1.txt | 2 | ||||
| -rw-r--r-- | docs/releases/1.5-beta-1.txt | 2 | ||||
| -rw-r--r-- | docs/releases/1.5.txt | 2 |
4 files changed, 4 insertions, 15 deletions
diff --git a/docs/ref/utils.txt b/docs/ref/utils.txt index 6fa829ef22..c29c210be7 100644 --- a/docs/ref/utils.txt +++ b/docs/ref/utils.txt @@ -188,18 +188,7 @@ The functions defined in this module share the following properties: ========================= .. module:: django.utils.encoding - :synopsis: A series of helper classes and function to manage character encoding. - -.. class:: StrAndUnicode - - A class that derives ``__str__`` from ``__unicode__``. - - On Python 2, ``__str__`` returns the output of ``__unicode__`` encoded as - a UTF-8 bytestring. On Python 3, ``__str__`` returns the output of - ``__unicode__``. - - Useful as a mix-in. If you support Python 2 and 3 with a single code base, - you can inherit this mix-in and just define ``__unicode__``. + :synopsis: A series of helper function to manage character encoding. .. function:: python_2_unicode_compatible diff --git a/docs/releases/1.5-alpha-1.txt b/docs/releases/1.5-alpha-1.txt index 9ff4ca44db..15169131df 100644 --- a/docs/releases/1.5-alpha-1.txt +++ b/docs/releases/1.5-alpha-1.txt @@ -615,7 +615,7 @@ explicitly. ``django.utils.encoding.StrAndUnicode`` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The :class:`~django.utils.encoding.StrAndUnicode` mix-in has been deprecated. +The ``django.utils.encoding.StrAndUnicode`` mix-in has been deprecated. Define a ``__str__`` method and apply the :func:`~django.utils.encoding.python_2_unicode_compatible` decorator instead. diff --git a/docs/releases/1.5-beta-1.txt b/docs/releases/1.5-beta-1.txt index 9c3b9e78e6..69c591ac03 100644 --- a/docs/releases/1.5-beta-1.txt +++ b/docs/releases/1.5-beta-1.txt @@ -668,7 +668,7 @@ If you rely on features added to :mod:`simplejson` after it became Python's ``django.utils.encoding.StrAndUnicode`` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The :class:`~django.utils.encoding.StrAndUnicode` mix-in has been deprecated. +The ``django.utils.encoding.StrAndUnicode`` mix-in has been deprecated. Define a ``__str__`` method and apply the :func:`~django.utils.encoding.python_2_unicode_compatible` decorator instead. diff --git a/docs/releases/1.5.txt b/docs/releases/1.5.txt index 3948c867a3..a4b03bc197 100644 --- a/docs/releases/1.5.txt +++ b/docs/releases/1.5.txt @@ -775,7 +775,7 @@ If you rely on features added to :mod:`simplejson` after it became Python's ``django.utils.encoding.StrAndUnicode`` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The :class:`~django.utils.encoding.StrAndUnicode` mix-in has been deprecated. +The ``django.utils.encoding.StrAndUnicode`` mix-in has been deprecated. Define a ``__str__`` method and apply the :func:`~django.utils.encoding.python_2_unicode_compatible` decorator instead. |