-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 This patch looks good to me. acked. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlJpNPAACgkQrlYvE4MpobO3CwCgjK8LopSi7pLZHcj1ihzxbNIH ecgAn3eUO0ksVAI5RM3dSkOSBzSTVsAP =R3ng -----END PGP SIGNATURE-----
>From a2136bf5b509a3b5112d939502dd630102ab8290 Mon Sep 17 00:00:00 2001 From: Dan Walsh <dwalsh@xxxxxxxxxx> Date: Fri, 11 Oct 2013 08:44:47 -0400 Subject: [PATCH 46/74] Cleanup handling of translations code --- policycoreutils/semanage/seobject.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/policycoreutils/semanage/seobject.py b/policycoreutils/semanage/seobject.py index 85bc37f..fb06935 100644 --- a/policycoreutils/semanage/seobject.py +++ b/policycoreutils/semanage/seobject.py @@ -1,5 +1,5 @@ #! /usr/bin/python -Es -# Copyright (C) 2005-2011 Red Hat +# Copyright (C) 2005-2013 Red Hat # see file 'COPYING' for use and warranty information # # semanage is a tool for managing SELinux configuration files @@ -32,11 +32,10 @@ from IPy import IP import gettext gettext.bindtextdomain(PROGNAME, "/usr/share/locale") gettext.textdomain(PROGNAME) -try: - gettext.install(PROGNAME, localedir = "/usr/share/locale", unicode = 1) -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + +import gettext +translation=gettext.translation(PROGNAME, localedir = "/usr/share/locale", fallback=True) +_=translation.ugettext import syslog -- 1.8.3.1
