From ac556a2ad1213b8bb81372fe6fb762f5fcb076de Mon Sep 17 00:00:00 2001 From: "Tomas R." Date: Sun, 3 Nov 2024 17:54:42 +0100 Subject: [PATCH] gh-126357: Remove gettext import guards (GH-126358) --- Lib/getopt.py | 7 ++----- Lib/optparse.py | 15 ++------------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/Lib/getopt.py b/Lib/getopt.py index e5fd04fe12a..1df5b96472a 100644 --- a/Lib/getopt.py +++ b/Lib/getopt.py @@ -34,11 +34,8 @@ option involved with the exception. __all__ = ["GetoptError","error","getopt","gnu_getopt"] import os -try: - from gettext import gettext as _ -except ImportError: - # Bootstrapping Python: gettext's dependencies not built yet - def _(s): return s +from gettext import gettext as _ + class GetoptError(Exception): opt = '' diff --git a/Lib/optparse.py b/Lib/optparse.py index 1c450c6fcbe..04112eca37c 100644 --- a/Lib/optparse.py +++ b/Lib/optparse.py @@ -75,6 +75,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import sys, os import textwrap +from gettext import gettext as _, ngettext + def _repr(self): return "<%s at 0x%x: %s>" % (self.__class__.__name__, id(self), self) @@ -86,19 +88,6 @@ def _repr(self): # Id: help.py 527 2006-07-23 15:21:30Z greg # Id: errors.py 509 2006-04-20 00:58:24Z gward -try: - from gettext import gettext, ngettext -except ImportError: - def gettext(message): - return message - - def ngettext(singular, plural, n): - if n == 1: - return singular - return plural - -_ = gettext - class OptParseError (Exception): def __init__(self, msg):