diff options
| author | Tim Graham <timograham@gmail.com> | 2016-01-22 19:01:54 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-03-05 11:00:12 -0500 |
| commit | c3e22ba78d1f6a780d1181cb16e3240136f2ae59 (patch) | |
| tree | 9b8cb65ffc2a7a8797a294093240befd449c9aa2 /docs/topics/python3.txt | |
| parent | 9ed4a788aa8d6ba6a57a2daa15253c3047048dfb (diff) | |
| download | django-24046.tar.gz | |
Refs #24046 -- POC for mark_for_escaping() removal.24046
Diffstat (limited to 'docs/topics/python3.txt')
| -rw-r--r-- | docs/topics/python3.txt | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/docs/topics/python3.txt b/docs/topics/python3.txt index 003dd0ebc5..c252e98d49 100644 --- a/docs/topics/python3.txt +++ b/docs/topics/python3.txt @@ -112,22 +112,18 @@ For forwards compatibility, the new names work as of Django 1.4.2. information. :mod:`django.utils.safestring` is mostly used via the -:func:`~django.utils.safestring.mark_safe` and -:func:`~django.utils.safestring.mark_for_escaping` functions, which didn't -change. In case you're using the internals, here are the name changes: +:func:`~django.utils.safestring.mark_safe` function, which didn't change. In +case you're using the internals, here are the name changes: ================== ================== Old name New name ================== ================== -``EscapeString`` ``EscapeBytes`` -``EscapeUnicode`` ``EscapeText`` ``SafeString`` ``SafeBytes`` ``SafeUnicode`` ``SafeText`` ================== ================== -For backwards compatibility, the old names still work on Python 2. Under -Python 3, ``EscapeString`` and ``SafeString`` are aliases for ``EscapeText`` -and ``SafeText`` respectively. +For backwards compatibility, the old names still work on Python 2. On Python 3, +``SafeString`` is an alias for ``SafeText``. For forwards compatibility, the new names work as of Django 1.4.2. |