Skip to content

gh-126357: Remove gettext import guards #126358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 3, 2024
Merged

gh-126357: Remove gettext import guards #126358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions Lib/getopt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,8 @@
__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 = ''
Expand Down
15 changes: 2 additions & 13 deletions Lib/optparse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@

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)
Expand All @@ -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):
Expand Down
Loading