summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorRamiro Morales <cramm0@gmail.com>2013-06-28 23:05:00 -0300
committerRamiro Morales <cramm0@gmail.com>2013-06-28 23:16:28 -0300
commit24bbf1367a1eed9443571622ab74c2c3e3d3db11 (patch)
tree0767a79ac536250c6997dde49cf44dfbaaafdef8 /docs/ref
parent425a4292083c7355a2a4ef9676f605a9c3b8fe70 (diff)
Removed django.utils.encoding.StrAndUnicode class, deprecated in Django 1.5.
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/utils.txt13
1 files changed, 1 insertions, 12 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