[meld/deprecation-cleanup: 19/48] bin/meld: Remove Python 2 remnant	support
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc: 
- Subject: [meld/deprecation-cleanup: 19/48] bin/meld: Remove Python 2 remnant	support
- Date: Sun,  2 Dec 2018 02:43:43 +0000 (UTC)
commit 906f85111cb8c205c3a36967dd48c56c7b851cae
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Dec 1 07:05:39 2018 +1000
    bin/meld: Remove Python 2 remnant support
    
    There's no reason to have this any more.
 bin/meld | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/bin/meld b/bin/meld
index 57a7406c..1199c9de 100755
--- a/bin/meld
+++ b/bin/meld
@@ -102,13 +102,8 @@ except locale.Error as e:
     locale.setlocale(locale.LC_ALL, 'C')
 gettext.textdomain(locale_domain)
 trans = gettext.translation(locale_domain, localedir=locale_dir, fallback=True)
-try:
-    _ = meld.conf._ = trans.ugettext
-    meld.conf.ngettext = trans.ungettext
-except AttributeError:
-    # py3k
-    _ = meld.conf._ = trans.gettext
-    meld.conf.ngettext = trans.ngettext
+_ = meld.conf._ = trans.gettext
+meld.conf.ngettext = trans.ngettext
 
 try:
     if os.name == 'nt':
[
Date Prev][
Date Next]   [
Thread Prev][
Thread Next]   
[
Thread Index]
[
Date Index]
[
Author Index]