From c335f168553d9a664879c99187ee9222bd479f45 Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Sun, 19 Apr 2020 22:57:24 -0700 Subject: [PATCH] [3.0.x] Refs #30165 -- Removed obsolete doc references to deprecated ugettext() & co. The u-prefixed variants were removed from the documentation in 6eb4996672ca5ccaba20e468d91a83d1cd019801. Backport of fb21625270ab169fd436c36dd51acb642a97ee50 from master --- docs/ref/utils.txt | 4 ---- docs/topics/i18n/translation.txt | 6 ------ 2 files changed, 10 deletions(-) diff --git a/docs/ref/utils.txt b/docs/ref/utils.txt index 65ead4a666..9b6b57517b 100644 --- a/docs/ref/utils.txt +++ b/docs/ref/utils.txt @@ -997,10 +997,6 @@ appropriate entities. For a complete discussion on the usage of the following see the :doc:`translation documentation `. -The ``u`` prefix on the functions below comes from a difference in Python 2 -between unicode and bytestrings. If your code doesn't support Python 2, use the -functions without the ``u``. - .. function:: gettext(message) Translates ``message`` and returns it as a string. diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt index 4feea303bf..7220d13009 100644 --- a/docs/topics/i18n/translation.txt +++ b/docs/topics/i18n/translation.txt @@ -52,12 +52,6 @@ Specify a translation string by using the function :func:`~django.utils.translation.gettext`. It's convention to import this as a shorter alias, ``_``, to save typing. -.. note:: - The ``u`` prefixing of ``gettext`` functions was originally to distinguish - usage between unicode strings and bytestrings on Python 2. For code that - supports only Python 3, they can be used interchangeably. A deprecation for - the prefixed functions may happen in a future Django release. - .. note:: Python's standard library ``gettext`` module installs ``_()`` into the global namespace, as an alias for ``gettext()``. In Django, we have chosen