diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/utils.txt | 14 | ||||
| -rw-r--r-- | docs/releases/4.0.txt | 2 |
2 files changed, 2 insertions, 14 deletions
diff --git a/docs/ref/utils.txt b/docs/ref/utils.txt index f88fc7f9e7..b04e1196d4 100644 --- a/docs/ref/utils.txt +++ b/docs/ref/utils.txt @@ -248,20 +248,6 @@ The functions defined in this module share the following properties: If ``strings_only`` is ``True``, don't convert (some) non-string-like objects. -.. function:: smart_text(s, encoding='utf-8', strings_only=False, errors='strict') - - .. deprecated:: 3.0 - - Alias of :func:`force_str` for backwards compatibility, especially in code - that supports Python 2. - -.. function:: force_text(s, encoding='utf-8', strings_only=False, errors='strict') - - .. deprecated:: 3.0 - - Alias of :func:`force_str` for backwards compatibility, especially in code - that supports Python 2. - .. function:: iri_to_uri(iri) Convert an Internationalized Resource Identifier (IRI) portion to a URI diff --git a/docs/releases/4.0.txt b/docs/releases/4.0.txt index 970a5ff126..9865f59d6e 100644 --- a/docs/releases/4.0.txt +++ b/docs/releases/4.0.txt @@ -249,6 +249,8 @@ to remove usage of these features. * ``django.utils.http.urlquote()``, ``urlquote_plus()``, ``urlunquote()``, and ``urlunquote_plus()`` are removed. +* ``django.utils.encoding.force_text()`` and ``smart_text()`` are removed. + See :ref:`deprecated-features-3.1` for details on these changes, including how to remove usage of these features. |