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 17:44:54 +0100 |
| commit | 5c5eb5fea4d7dcd2b0eed982021cfa8aeee2efd8 (patch) | |
| tree | f44ac73f7da7640547c96bd84f6b825d729d4a40 /django | |
| parent | 89e2c60f4396241c667b7a1de37765b7c96d702f (diff) | |
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.
Diffstat (limited to 'django')
| -rw-r--r-- | django/utils/safestring.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/utils/safestring.py b/django/utils/safestring.py index ad8054fe0f..50b0c03686 100644 --- a/django/utils/safestring.py +++ b/django/utils/safestring.py @@ -144,4 +144,4 @@ def mark_for_escaping(s): return EscapeBytes(s) if isinstance(s, (six.text_type, Promise)): return EscapeText(s) - return EscapeBytes(bytes(s)) + return EscapeString(str(s)) |