diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2014-12-23 21:49:05 +0100 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2014-12-27 18:17:18 +0100 |
| commit | b429a9796a162f9e12e6d34579468621ba9accc7 (patch) | |
| tree | 12262a0507b0b134e31ebe32b5ba0b2b8cee6427 /docs | |
| parent | a79012f6d88a8cd67bd35c54b91d826f2b7a4cb2 (diff) | |
[1.7.x] Fixed an inconsistency introduced in 547b1810.
mark_safe and mark_for_escaping should have been kept similar.
On Python 2 this change has no effect. On Python 3 it fixes the use case
shown in the regression test for mark_for_escaping, which used to raise
a TypeError. The regression test for mark_safe is just for completeness.
Backport of 5c5eb5fe from master.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/releases/1.7.2.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/releases/1.7.2.txt b/docs/releases/1.7.2.txt index 31a96a4ccd..84188cd494 100644 --- a/docs/releases/1.7.2.txt +++ b/docs/releases/1.7.2.txt @@ -175,3 +175,6 @@ Bugfixes * Corrected ``contrib.sites`` default site creation in a multiple database setup (:ticket:`24000`). + +* Restored support for objects that aren't :class:`str` or :class:`bytes` in + :func:`~django.utils.safestring.mark_for_escaping` on Python 3. |