Browse files

[1.5.x] Fixed #20691 -- Added a note for __str__() vs. __unicode__() …

…and Python 3.

Thanks garrison for the suggestion.

Backport of 8a67938 from master.
  • Loading branch information...
1 parent 62a9abe commit 4453d8651af4579b3b83d873cadbda0707b7ab2a @timgraham timgraham committed Jul 3, 2013
Showing with 7 additions and 0 deletions.
  1. +7 −0 docs/ref/unicode.txt
@@ -240,6 +240,13 @@ Django will convert it to Unicode when it needs to.
Choosing between ``__str__()`` and ``__unicode__()``
+.. note::
+ If you are on Python 3, you can skip this section because you'll always
+ create ``__str__()`` rather than ``__unicode__()``. If you'd like
+ compatibility with Python 2, you can decorate your model class with
+ :func:`~django.utils.encoding.python_2_unicode_compatible`.
One consequence of using Unicode by default is that you have to take some care
when printing data from the model.

0 comments on commit 4453d86

Please sign in to comment.