1
0
mirror of https://github.com/django/django.git synced 2025-03-14 19:30:46 +00:00
Aymeric Augustin b429a9796a [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.
2014-12-27 18:17:18 +01:00
..
2014-02-28 21:03:46 -05:00
2014-08-05 08:23:57 -04:00
2013-10-10 16:49:20 -04:00
2012-08-31 20:35:50 +02:00
2014-02-25 10:28:32 -05:00
2012-08-31 20:35:50 +02:00
2014-02-25 10:28:32 -05:00
2013-09-10 21:07:22 -04:00
2013-09-15 14:14:26 -04:00
2013-11-07 09:42:25 -05:00
2014-02-28 11:44:03 -05:00
2013-03-28 15:03:19 -05:00
2013-09-10 21:07:22 -04:00
2013-09-15 14:14:26 -04:00
2013-11-09 10:17:17 -05:00