Remove new l* functions from original change.

Author: csabella

Doc/library/gettext.rst

@@ -49,10 +49,8 @@ class-based API instead.
 .. function:: bind_textdomain_codeset(domain, codeset=None)
 
    Bind the *domain* to *codeset*, changing the encoding of byte strings
-   returned by the :func:`lgettext`, :func:`ldgettext`, :func:`lngettext`,
-   :func:`ldngettext`, :func:`lpgettext`, :func:`ldpgettext`,
-   :func:`lnpgettext`, and :func:`ldnpgettext` functions.
-   If *codeset* is omitted, then the current binding is returned.
+   returned by the :func:`lgettext`, :func:`ldgettext`, :func:`lngettext`
+   and :func:`ldngettext` functions.
 
    .. deprecated-removed:: 3.8 3.10
 
@@ -113,17 +111,12 @@ class-based API instead.
 .. function:: ldgettext(domain, message)
 .. function:: lngettext(singular, plural, n)
 .. function:: ldngettext(domain, singular, plural, n)
-.. function:: lpgettext(context, message)
-.. function:: ldpgettext(domain, context, message)
-.. function:: lnpgettext(context, singular, plural, n)
-.. function:: ldnpgettext(domain, context, singular, plural, n)
 
    Equivalent to the corresponding functions without the ``l`` prefix
-   (:func:`.gettext`, :func:`dgettext`, :func:`ngettext`, :func:`dngettext`,
-   :func:`pgettext`, :func:`dpgettext`, :func:`npgettext`, and
-   :func:`dnpgettext`), but the translation is returned as a byte string
-   encoded in the preferred system encoding if no other encoding was
-   explicitly set with :func:`bind_textdomain_codeset`.
+   (:func:`.gettext`, :func:`dgettext`, :func:`ngettext` and :func:`dngettext`),
+   but the translation is returned as a byte string encoded in the preferred
+   system encoding if no other encoding was explicitly set with
+   :func:`bind_textdomain_codeset`.
 
    .. warning::
 
@@ -303,13 +296,10 @@ are the methods of :class:`!NullTranslations`:
 
    .. method:: lgettext(message)
    .. method:: lngettext(singular, plural, n)
-   .. method:: lpgettext(context, message)
-   .. method:: lnpgettext(context, singular, plural, n)
 
-      Equivalent to :meth:`.gettext`, :meth:`.ngettext`, :meth:`.pgettext`,
-      and :meth:`npgettext`, but the translation is returned as a byte string
-      encoded in the preferred system encoding if no encoding was explicitly
-      set with :meth:`set_output_charset`.
+      Equivalent to :meth:`.gettext` and :meth:`.ngettext`, but the translation
+      is returned as a byte string encoded in the preferred system encoding
+      if no encoding was explicitly set with :meth:`set_output_charset`.
       Overridden in derived classes.
 
       .. warning::
@@ -332,9 +322,8 @@ are the methods of :class:`!NullTranslations`:
 
    .. method:: output_charset()
 
-      Return the encoding used to return translated messages in
-      :meth:`.lgettext`, :meth:`.lngettext`, :meth:`.lpgettext`, and
-      :meth:`.lnpgettext`.
+      Return the encoding used to return translated messages in :meth:`.lgettext`
+      and :meth:`.lngettext`.
 
       .. deprecated-removed:: 3.8 3.10
 
@@ -354,8 +343,7 @@ are the methods of :class:`!NullTranslations`:
       If the *names* parameter is given, it must be a sequence containing the
       names of functions you want to install in the builtins namespace in
       addition to :func:`_`.  Supported names are ``'gettext'``, ``'ngettext'``,
-      ``'pgettext'``, ``'lgettext'``, ``'lngettext'``, ``'lpgettext'``,  and
-      ``'lnpgettext'``.
+      ``'pgettext'``, ``'lgettext'``, and ``'lngettext'``.
 
       Note that this is only one way, albeit the most convenient way, to make
       the :func:`_` function available to your application.  Because it affects
@@ -461,8 +449,6 @@ unexpected, or if other problems occur while reading the file, instantiating a
 
    .. method:: lgettext(message)
    .. method:: lngettext(singular, plural, n)
-   .. method:: lpgettext(context, message)
-   .. method:: lnpgettext(context, singular, plural, n)
 
       Equivalent to :meth:`.gettext` and :meth:`.ngettext`, but the translation
       is returned as a byte string encoded in the preferred system encoding

Lib/gettext.py

@@ -58,7 +58,6 @@
            'dgettext', 'dngettext', 'gettext', 'lgettext', 'ldgettext',
            'ldngettext', 'lngettext', 'ngettext',
            'pgettext', 'dpgettext', 'npgettext', 'dnpgettext',
-           'lpgettext', 'ldpgettext', 'lnpgettext', 'ldnpgettext',
            ]
 
 _default_localedir = os.path.join(sys.base_prefix, 'share', 'locale')
@@ -318,13 +317,6 @@ def pgettext(self, context, message):
             return self._fallback.pgettext(context, message)
         return message
 
-    def lpgettext(self, context, message):
-        if self._fallback:
-            return self._fallback.lpgettext(context, message)
-        if self._output_charset:
-            return message.encode(self._output_charset)
-        return message.encode(locale.getpreferredencoding())
-
     def npgettext(self, context, msgid1, msgid2, n):
         if self._fallback:
             return self._fallback.npgettext(context, msgid1, msgid2, n)
@@ -333,17 +325,6 @@ def npgettext(self, context, msgid1, msgid2, n):
         else:
             return msgid2
 
-    def lnpgettext(self, context, msgid1, msgid2, n):
-        if self._fallback:
-            return self._fallback.lnpgettext(context, msgid1, msgid2, n)
-        if n == 1:
-            tmsg = msgid1
-        else:
-            tmsg = msgid2
-        if self._output_charset:
-            return tmsg.encode(self._output_charset)
-        return tmsg.encode(locale.getpreferredencoding())
-
     def info(self):
         return self._info
 
@@ -366,8 +347,8 @@ def install(self, names=None):
         import builtins
         builtins.__dict__['_'] = self.gettext
         if names is not None:
-            allowed = {'gettext', 'lgettext', 'lngettext', 'lnpgettext',
-                       'lpgettext', 'ngettext', 'npgettext', 'pgettext'}
+            allowed = {'gettext', 'lgettext', 'lngettext',
+                       'ngettext', 'npgettext', 'pgettext'}
             for name in allowed & set(names):
                 builtins.__dict__[name] = getattr(self, name)
 
@@ -549,33 +530,6 @@ def npgettext(self, context, msgid1, msgid2, n):
                 tmsg = msgid2
         return tmsg
 
-    def lpgettext(self, context, message):
-        ctxt_msg_id = self.CONTEXT % (context, message)
-        missing = object()
-        tmsg = self._catalog.get(ctxt_msg_id, missing)
-        if tmsg is missing:
-            if self._fallback:
-                return self._fallback.lpgettext(context, message)
-            tmsg = message
-        if self._output_charset:
-            return tmsg.encode(self._output_charset)
-        return tmsg.encode(locale.getpreferredencoding())
-
-    def lnpgettext(self, context, msgid1, msgid2, n):
-        ctxt_msg_id = self.CONTEXT % (context, msgid1)
-        try:
-            tmsg = self._catalog[(ctxt_msg_id, self.plural(n))]
-        except KeyError:
-            if self._fallback:
-                return self._fallback.lnpgettext(context, msgid1, msgid2, n)
-            if n == 1:
-                tmsg = msgid1
-            else:
-                tmsg = msgid2
-        if self._output_charset:
-            return tmsg.encode(self._output_charset)
-        return tmsg.encode(locale.getpreferredencoding())
-
 
 # Locate a .mo file using the gettext strategy
 def find(domain, localedir=None, languages=None, all=False):
@@ -761,26 +715,15 @@ def ldngettext(domain, msgid1, msgid2, n):
 
 def dpgettext(domain, context, message):
     try:
-        t = translation(domain, _localedirs.get(domain, None),
-                        codeset=_localecodesets.get(domain))
+        t = translation(domain, _localedirs.get(domain, None))
     except OSError:
         return message
     return t.pgettext(context, message)
 
 
-def ldpgettext(domain, context, message):
-    codeset = _localecodesets.get(domain)
-    try:
-        t = translation(domain, _localedirs.get(domain, None), codeset=codeset)
-    except OSError:
-        return message.encode(codeset or locale.getpreferredencoding())
-    return t.lpgettext(context, message)
-
-
 def dnpgettext(domain, context, msgid1, msgid2, n):
     try:
-        t = translation(domain, _localedirs.get(domain, None),
-                        codeset=_localecodesets.get(domain))
+        t = translation(domain, _localedirs.get(domain, None))
     except OSError:
         if n == 1:
             return msgid1
@@ -789,19 +732,6 @@ def dnpgettext(domain, context, msgid1, msgid2, n):
     return t.npgettext(context, msgid1, msgid2, n)
 
 
-def ldnpgettext(domain, context, msgid1, msgid2, n):
-    codeset = _localecodesets.get(domain)
-    try:
-        t = translation(domain, _localedirs.get(domain, None), codeset=codeset)
-    except OSError:
-        if n == 1:
-            tmsg = msgid1
-        else:
-            tmsg = msgid2
-        return tmsg.encode(codeset or locale.getpreferredencoding())
-    return t.lnpgettext(context, msgid1, msgid2, n)
-
-
 def gettext(message):
     return dgettext(_current_domain, message)
 
@@ -834,18 +764,10 @@ def pgettext(context, message):
     return dpgettext(_current_domain, context, message)
 
 
-def lpgettext(context, message):
-    return ldpgettext(_current_domain, context, message)
-
-
 def npgettext(context, msgid1, msgid2, n):
     return dnpgettext(_current_domain, context, msgid1, msgid2, n)
 
 
-def lnpgettext(context, msgid1, msgid2, n):
-    return ldnpgettext(_current_domain, context, msgid1, msgid2, n)
-
-
 # dcgettext() has been deemed unnecessary and is not implemented.
 
 # James Henstridge's Catalog constructor from GNOME gettext.  Documented usage