From 384e1e196d4d70d0af17bdeaa3edb1c539e26497 Mon Sep 17 00:00:00 2001 From: Chris Mayo Date: Wed, 15 Apr 2020 19:49:16 +0100 Subject: [PATCH] Remove Python 2 gettext builtin installation --- linkcheck/i18n.py | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/linkcheck/i18n.py b/linkcheck/i18n.py index 324b0bac..283c1593 100644 --- a/linkcheck/i18n.py +++ b/linkcheck/i18n.py @@ -33,21 +33,10 @@ default_domain = None def install_builtin (translator, do_unicode): """Install _() and _n() gettext methods into default namespace.""" - try: - import __builtin__ as builtins - except ImportError: - # Python 3 - import builtins - # Python 3 has no ugettext - has_unicode = hasattr(translator, 'ugettext') - if do_unicode and has_unicode: - builtins.__dict__['_'] = translator.ugettext - # also install ngettext - builtins.__dict__['_n'] = translator.ungettext - else: - builtins.__dict__['_'] = translator.gettext - # also install ngettext - builtins.__dict__['_n'] = translator.ngettext + import builtins + builtins.__dict__['_'] = translator.gettext + # also install ngettext + builtins.__dict__['_n'] = translator.ngettext class Translator (gettext.GNUTranslations): """A translation class always installing its gettext methods into the