translation patch for semanage

translation patch for semanage

[Daniel J Walsh]

[-- Attachment #1: Type: text/plain, Size: 53 bytes --]

This patch works around a unicode problem in python.

[-- Attachment #2: policycoreuitls-semanage.patch --]
[-- Type: text/x-patch, Size: 865 bytes --]

--- nsapolicycoreutils/semanage/semanage	2006-11-16 17:14:26.000000000 -0500
+++ policycoreutils-1.33.10/semanage/semanage	2007-01-09 11:55:52.000000000 -0500
@@ -23,12 +23,21 @@
 import os, sys, getopt
 import seobject
 import selinux
+PROGNAME="policycoreutils"
+
 import gettext
+gettext.bindtextdomain(PROGNAME, "/usr/share/locale")
+gettext.textdomain(PROGNAME)
+import codecs
+import locale
+sys.stderr = codecs.getwriter(locale.getpreferredencoding())(sys.__stderr__, 'replace')
+sys.stdout = codecs.getwriter(locale.getpreferredencoding())(sys.__stdout__, 'replace')
 
 try:
-       gettext.install('policycoreutils')
-except:
-       pass
+       gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1)
+except IOError:
+       import __builtin__
+       __builtin__.__dict__['_'] = unicode
 
 is_mls_enabled=selinux.is_selinux_mls_enabled()
 

Re: translation patch for semanage

[Karl MacMillan]

On Thu, 2007-01-11 at 09:09 -0500, Daniel J Walsh wrote:
> This patch works around a unicode problem in python.

Can you give a little more detail - perhaps a BZ? It appears that this
patch and the seobject patch or to force all translated strings to be
unicode and output as unicode, correct? Why is this necessary?

> --- nsapolicycoreutils/semanage/semanage        2006-11-16
> 17:14:26.000000000 -0500
> +++ policycoreutils-1.33.10/semanage/semanage   2007-01-09
> 11:55:52.000000000 -0500
> @@ -23,12 +23,21 @@
>  import os, sys, getopt
>  import seobject
>  import selinux
> +PROGNAME="policycoreutils"
> +
>  import gettext
> +gettext.bindtextdomain(PROGNAME, "/usr/share/locale")

Why is the location of the local files being forced? Is this appropriate
for all distros or does it need to be configurable?

> 
> +gettext.textdomain(PROGNAME)
> +import codecs
> +import locale
> +sys.stderr =
> codecs.getwriter(locale.getpreferredencoding())(sys.__stderr__,
> 'replace')
> +sys.stdout =
> codecs.getwriter(locale.getpreferredencoding())(sys.__stdout__,
> 'replace')

Is this related to
http://mail.python.org/pipermail/pythonmac-sig/2004-March/010651.html?
I.e., is this to force the encoding rather than relying on the term to
correctly communicate that it supports unicode / utf8 / etc.?

If so, is this the "right" fix or just expedient?

Karl
 



--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

Re: translation patch for semanage

[Daniel J Walsh]

Karl MacMillan wrote:
> On Thu, 2007-01-11 at 09:09 -0500, Daniel J Walsh wrote:
>   
>> This patch works around a unicode problem in python.
>>     
>
> Can you give a little more detail - perhaps a BZ? It appears that this
> patch and the seobject patch or to force all translated strings to be
> unicode and output as unicode, correct? Why is this necessary?
>   
No this patch forces all output strings to be the locale default.  So it 
basically does the right thing.  BTW print works correctly.

I can not find any matching bugs on python source forge but trying to 
login there is causing me no end of head aches.  Asking people in the 
know around here, I get this response

+import codecs
> +import locale
> +sys.stderr =
> codecs.getwriter(locale.getpreferredencoding())(sys.__stderr__,'replace')
> 
> I was told by Ray that you knew about this problem in python?  Do you know if this is an open bug?


Don't know if it's an open bug per se; other than python is well known
to be broken w/ respect to codecs.

Thanks,
-Jonathan


>   
>> --- nsapolicycoreutils/semanage/semanage        2006-11-16
>> 17:14:26.000000000 -0500
>> +++ policycoreutils-1.33.10/semanage/semanage   2007-01-09
>> 11:55:52.000000000 -0500
>> @@ -23,12 +23,21 @@
>>  import os, sys, getopt
>>  import seobject
>>  import selinux
>> +PROGNAME="policycoreutils"
>> +
>>  import gettext
>> +gettext.bindtextdomain(PROGNAME, "/usr/share/locale")
>>     
>
> Why is the location of the local files being forced? Is this appropriate
> for all distros or does it need to be configurable?
>
>   
>> +gettext.textdomain(PROGNAME)
>> +import codecs
>> +import locale
>> +sys.stderr =
>> codecs.getwriter(locale.getpreferredencoding())(sys.__stderr__,
>> 'replace')
>> +sys.stdout =
>> codecs.getwriter(locale.getpreferredencoding())(sys.__stdout__,
>> 'replace')
>>     
>
> Is this related to
> http://mail.python.org/pipermail/pythonmac-sig/2004-March/010651.html?
> I.e., is this to force the encoding rather than relying on the term to
> correctly communicate that it supports unicode / utf8 / etc.?
>
> If so, is this the "right" fix or just expedient?
>
> Karl
>  
>
>
>   


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

Re: translation patch for semanage

[Karl MacMillan]

Daniel J Walsh wrote:
> This patch works around a unicode problem in python.
> 

Acked-by: Karl MacMillan <kmacmillan@mentalrootkit.com>

Both this patch and the related seobject patch are merged as of 
policycoreutils 1.33.13.

Karl

> 
> ------------------------------------------------------------------------
> 
> --- nsapolicycoreutils/semanage/semanage	2006-11-16 17:14:26.000000000 -0500
> +++ policycoreutils-1.33.10/semanage/semanage	2007-01-09 11:55:52.000000000 -0500
> @@ -23,12 +23,21 @@
>  import os, sys, getopt
>  import seobject
>  import selinux
> +PROGNAME="policycoreutils"
> +
>  import gettext
> +gettext.bindtextdomain(PROGNAME, "/usr/share/locale")
> +gettext.textdomain(PROGNAME)
> +import codecs
> +import locale
> +sys.stderr = codecs.getwriter(locale.getpreferredencoding())(sys.__stderr__, 'replace')
> +sys.stdout = codecs.getwriter(locale.getpreferredencoding())(sys.__stdout__, 'replace')
>  
>  try:
> -       gettext.install('policycoreutils')
> -except:
> -       pass
> +       gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1)
> +except IOError:
> +       import __builtin__
> +       __builtin__.__dict__['_'] = unicode
>  
>  is_mls_enabled=selinux.is_selinux_mls_enabled()
>  


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.