Move __unicode__ documentation and its notice after __str__

[Simon Charette]

In the ​other model instance methods doc we start by documenting by a notice about __unicode__ vs __str__ followed by the actual __unicode__ and __str__ documentation.

Because of the way blocks are arranged it's not clear the notice is about __unicode__ vs __str__ or and not other model instance methods in general.

Since the tutorial is oriented toward Python 3 I would suggest we reorder the doc blocks as follow:

1. __str__;
2. __str__ vs __unicode__ notice;
3. __unicode__.

It should make it clear the notice is about interaction of both methods and express our preference toward Python 3.

[Simon Charette]

Actually this whole section would benefit of a small rewrite with Python 3 in mind.

[Tim Graham]

I think I would remove the heading/and method annotation for __unicode__ and leave it mentioned in a note box under __str__ with a title like "Using Python 2?".

[Simon Charette]

Replying to timgraham:

I think I would remove the heading/and method annotation for __unicode__ and leave it mentioned in a note box under __str__ with a title like "Using Python 2?".

Makes sense to me.

[Tim Graham]

​PR

[Simon Charette]

LGTM, thanks Tim!

[Tim Graham <timograham@…>]

In de99f558:

Fixed #25462 -- Removed Model.unicode() in favor of @python_2_unicode_compatible.

[Tim Graham <timograham@…>]

In 260e9f15:

[1.9.x] Fixed #25462 -- Removed Model.unicode() in favor of @python_2_unicode_compatible.

Backport of de99f558d806a2a1b30072ec95bc44d412d80dab from master