Attachment 6900 Details for Bug 16524 – Adapting gettext install command

[patch] Adapting gettext install command

0001-Adjust-gettext.install-for-python3.patch (text/plain), 5.17 KB, created by papoteur on 2015-08-04 20:31:47 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: papoteur

Created: 2015-08-04 20:31:47 CEST

Size: 5.17 KB

patch

obsolete

>From 772c5c8df1dea51350bdde89f3383f63f6e474b3 Mon Sep 17 00:00:00 2001
>From: Papoteur <papoteur@mageialinux-online.org>
>Date: Tue, 4 Aug 2015 19:59:32 +0200
>Subject: [PATCH] Adjust gettext.install for python3
>
>---
> src/msec/config.py          | 2 +-
> src/msec/help_draksec.py    | 4 ++--
> src/msec/libmsec.py         | 2 +-
> src/msec/msec.py            | 2 +-
> src/msec/msecgui.py         | 2 +-
> src/msec/msecperms.py       | 2 +-
> src/msec/plugins/audit.py   | 2 +-
> src/msec/plugins/log.py     | 2 +-
> src/msec/plugins/msec.py    | 2 +-
> src/msec/plugins/network.py | 2 +-
> src/msec/plugins/pam.py     | 2 +-
> src/msec/plugins/sectool.py | 2 +-
> src/msec/plugins/sudo.py    | 2 +-
> src/msec/tools.py           | 2 +-
> 14 files changed, 15 insertions(+), 15 deletions(-)
>
>diff --git a/src/msec/config.py b/src/msec/config.py
>index 6242fc7..b4466ed 100755
>--- a/src/msec/config.py
>+++ b/src/msec/config.py
>@@ -38,7 +38,7 @@ SECURITYLOG = '/var/log/msec.log'
> 
> # localization
> try:
>-    gettext.install('msec', str=1)
>+    gettext.install('msec')
> except IOError:
>     _ = str
> 
>diff --git a/src/msec/help_draksec.py b/src/msec/help_draksec.py
>index 6863038..893b12b 100755
>--- a/src/msec/help_draksec.py
>+++ b/src/msec/help_draksec.py
>@@ -31,7 +31,7 @@ import gettext
> 
> # localization
> try:
>-    gettext.install('msec', unicode=1)
>+    gettext.install('msec')
> except IOError:
>     _ = str
> 
>@@ -53,7 +53,7 @@ import gettext
> 
> # localization
> try:
>-    gettext.install('msec', unicode=1)
>+    gettext.install('msec')
> except IOError:
>     _ = str
> 
>diff --git a/src/msec/libmsec.py b/src/msec/libmsec.py
>index 17e8dd2..f8a296a 100755
>--- a/src/msec/libmsec.py
>+++ b/src/msec/libmsec.py
>@@ -57,7 +57,7 @@ from config import Narg
> 
> # localization
> try:
>-    gettext.install('msec', str=1)
>+    gettext.install('msec')
> except IOError:
>     _ = str
> 
>diff --git a/src/msec/msec.py b/src/msec/msec.py
>index a44267c..6e816c9 100755
>--- a/src/msec/msec.py
>+++ b/src/msec/msec.py
>@@ -28,7 +28,7 @@ import logging
> 
> # localization
> try:
>-    gettext.install('msec', str=1)
>+    gettext.install('msec')
> except IOError:
>     _ = str
> 
>diff --git a/src/msec/msecgui.py b/src/msec/msecgui.py
>index 0d64dea..2a7142f 100755
>--- a/src/msec/msecgui.py
>+++ b/src/msec/msecgui.py
>@@ -51,7 +51,7 @@ import logging
> # localization
> import gettext
> try:
>-    gettext.install("msec", str=1)
>+    gettext.install("msec")
> except IOError:
>     _ = str
> 
>diff --git a/src/msec/msecperms.py b/src/msec/msecperms.py
>index df3cdb1..2d0887a 100755
>--- a/src/msec/msecperms.py
>+++ b/src/msec/msecperms.py
>@@ -18,7 +18,7 @@ import getopt
> import gettext
> 
> try:
>-    gettext.install('msec', str=1)
>+    gettext.install('msec')
> except IOError:
>     _ = str
> 
>diff --git a/src/msec/plugins/audit.py b/src/msec/plugins/audit.py
>index dc5e6e0..8dee7ab 100755
>--- a/src/msec/plugins/audit.py
>+++ b/src/msec/plugins/audit.py
>@@ -10,7 +10,7 @@ import config
> import gettext
> # localization
> try:
>-    gettext.install('msec', str=1)
>+    gettext.install('msec')
> except IOError:
>     _ = str
> 
>diff --git a/src/msec/plugins/log.py b/src/msec/plugins/log.py
>index 3284cbc..993d3c0 100755
>--- a/src/msec/plugins/log.py
>+++ b/src/msec/plugins/log.py
>@@ -12,7 +12,7 @@ import config
> 
> # localization
> try:
>-    gettext.install('msec', str=1)
>+    gettext.install('msec')
> except IOError:
>     _ = str
> 
>diff --git a/src/msec/plugins/msec.py b/src/msec/plugins/msec.py
>index 59366a4..fa8a41d 100755
>--- a/src/msec/plugins/msec.py
>+++ b/src/msec/plugins/msec.py
>@@ -17,7 +17,7 @@ import config
> import gettext
> # localization
> try:
>-    gettext.install('msec', str=1)
>+    gettext.install('msec')
> except IOError:
>     _ = str
> 
>diff --git a/src/msec/plugins/network.py b/src/msec/plugins/network.py
>index a4f5400..ecaae94 100755
>--- a/src/msec/plugins/network.py
>+++ b/src/msec/plugins/network.py
>@@ -17,7 +17,7 @@ import config
> import gettext
> # localization
> try:
>-    gettext.install('msec', str=1)
>+    gettext.install('msec')
> except IOError:
>     _ = str
> 
>diff --git a/src/msec/plugins/pam.py b/src/msec/plugins/pam.py
>index 776ad70..e02b6d9 100755
>--- a/src/msec/plugins/pam.py
>+++ b/src/msec/plugins/pam.py
>@@ -14,7 +14,7 @@ import config
> 
> # localization
> try:
>-    gettext.install('msec', str=1)
>+    gettext.install('msec')
> except IOError:
>     _ = str
> 
>diff --git a/src/msec/plugins/sectool.py b/src/msec/plugins/sectool.py
>index a04dc51..72115a1 100755
>--- a/src/msec/plugins/sectool.py
>+++ b/src/msec/plugins/sectool.py
>@@ -14,7 +14,7 @@ import config
> 
> # localization
> try:
>-    gettext.install('msec', str=1)
>+    gettext.install('msec')
> except IOError:
>     _ = str
> 
>diff --git a/src/msec/plugins/sudo.py b/src/msec/plugins/sudo.py
>index 2df7fbd..1f9eddd 100755
>--- a/src/msec/plugins/sudo.py
>+++ b/src/msec/plugins/sudo.py
>@@ -14,7 +14,7 @@ import config
> 
> # localization
> try:
>-    gettext.install('msec', str=1)
>+    gettext.install('msec')
> except IOError:
>     _ = str
> 
>diff --git a/src/msec/tools.py b/src/msec/tools.py
>index 28c303b..baaeca2 100755
>--- a/src/msec/tools.py
>+++ b/src/msec/tools.py
>@@ -14,7 +14,7 @@ from config import Narg, SYS_ENC
> # localization
> import gettext
> try:
>-    gettext.install("msec", str=1)
>+    gettext.install("msec")
> except IOError:
>     _ = str
> 
>-- 
>2.3.8
>

From 772c5c8df1dea51350bdde89f3383f63f6e474b3 Mon Sep 17 00:00:00 2001
From: Papoteur <papoteur@mageialinux-online.org>
Date: Tue, 4 Aug 2015 19:59:32 +0200
Subject: [PATCH] Adjust gettext.install for python3

---
 src/msec/config.py          | 2 +-
 src/msec/help_draksec.py    | 4 ++--
 src/msec/libmsec.py         | 2 +-
 src/msec/msec.py            | 2 +-
 src/msec/msecgui.py         | 2 +-
 src/msec/msecperms.py       | 2 +-
 src/msec/plugins/audit.py   | 2 +-
 src/msec/plugins/log.py     | 2 +-
 src/msec/plugins/msec.py    | 2 +-
 src/msec/plugins/network.py | 2 +-
 src/msec/plugins/pam.py     | 2 +-
 src/msec/plugins/sectool.py | 2 +-
 src/msec/plugins/sudo.py    | 2 +-
 src/msec/tools.py           | 2 +-
 14 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/msec/config.py b/src/msec/config.py
index 6242fc7..b4466ed 100755
--- a/src/msec/config.py
+++ b/src/msec/config.py
@@ -38,7 +38,7 @@ SECURITYLOG = '/var/log/msec.log'
 
 # localization
 try:
-    gettext.install('msec', str=1)
+    gettext.install('msec')
 except IOError:
     _ = str
 
diff --git a/src/msec/help_draksec.py b/src/msec/help_draksec.py
index 6863038..893b12b 100755
--- a/src/msec/help_draksec.py
+++ b/src/msec/help_draksec.py
@@ -31,7 +31,7 @@ import gettext
 
 # localization
 try:
-    gettext.install('msec', unicode=1)
+    gettext.install('msec')
 except IOError:
     _ = str
 
@@ -53,7 +53,7 @@ import gettext
 
 # localization
 try:
-    gettext.install('msec', unicode=1)
+    gettext.install('msec')
 except IOError:
     _ = str
 
diff --git a/src/msec/libmsec.py b/src/msec/libmsec.py
index 17e8dd2..f8a296a 100755
--- a/src/msec/libmsec.py
+++ b/src/msec/libmsec.py
@@ -57,7 +57,7 @@ from config import Narg
 
 # localization
 try:
-    gettext.install('msec', str=1)
+    gettext.install('msec')
 except IOError:
     _ = str
 
diff --git a/src/msec/msec.py b/src/msec/msec.py
index a44267c..6e816c9 100755
--- a/src/msec/msec.py
+++ b/src/msec/msec.py
@@ -28,7 +28,7 @@ import logging
 
 # localization
 try:
-    gettext.install('msec', str=1)
+    gettext.install('msec')
 except IOError:
     _ = str
 
diff --git a/src/msec/msecgui.py b/src/msec/msecgui.py
index 0d64dea..2a7142f 100755
--- a/src/msec/msecgui.py
+++ b/src/msec/msecgui.py
@@ -51,7 +51,7 @@ import logging
 # localization
 import gettext
 try:
-    gettext.install("msec", str=1)
+    gettext.install("msec")
 except IOError:
     _ = str
 
diff --git a/src/msec/msecperms.py b/src/msec/msecperms.py
index df3cdb1..2d0887a 100755
--- a/src/msec/msecperms.py
+++ b/src/msec/msecperms.py
@@ -18,7 +18,7 @@ import getopt
 import gettext
 
 try:
-    gettext.install('msec', str=1)
+    gettext.install('msec')
 except IOError:
     _ = str
 
diff --git a/src/msec/plugins/audit.py b/src/msec/plugins/audit.py
index dc5e6e0..8dee7ab 100755
--- a/src/msec/plugins/audit.py
+++ b/src/msec/plugins/audit.py
@@ -10,7 +10,7 @@ import config
 import gettext
 # localization
 try:
-    gettext.install('msec', str=1)
+    gettext.install('msec')
 except IOError:
     _ = str
 
diff --git a/src/msec/plugins/log.py b/src/msec/plugins/log.py
index 3284cbc..993d3c0 100755
--- a/src/msec/plugins/log.py
+++ b/src/msec/plugins/log.py
@@ -12,7 +12,7 @@ import config
 
 # localization
 try:
-    gettext.install('msec', str=1)
+    gettext.install('msec')
 except IOError:
     _ = str
 
diff --git a/src/msec/plugins/msec.py b/src/msec/plugins/msec.py
index 59366a4..fa8a41d 100755
--- a/src/msec/plugins/msec.py
+++ b/src/msec/plugins/msec.py
@@ -17,7 +17,7 @@ import config
 import gettext
 # localization
 try:
-    gettext.install('msec', str=1)
+    gettext.install('msec')
 except IOError:
     _ = str
 
diff --git a/src/msec/plugins/network.py b/src/msec/plugins/network.py
index a4f5400..ecaae94 100755
--- a/src/msec/plugins/network.py
+++ b/src/msec/plugins/network.py
@@ -17,7 +17,7 @@ import config
 import gettext
 # localization
 try:
-    gettext.install('msec', str=1)
+    gettext.install('msec')
 except IOError:
     _ = str
 
diff --git a/src/msec/plugins/pam.py b/src/msec/plugins/pam.py
index 776ad70..e02b6d9 100755
--- a/src/msec/plugins/pam.py
+++ b/src/msec/plugins/pam.py
@@ -14,7 +14,7 @@ import config
 
 # localization
 try:
-    gettext.install('msec', str=1)
+    gettext.install('msec')
 except IOError:
     _ = str
 
diff --git a/src/msec/plugins/sectool.py b/src/msec/plugins/sectool.py
index a04dc51..72115a1 100755
--- a/src/msec/plugins/sectool.py
+++ b/src/msec/plugins/sectool.py
@@ -14,7 +14,7 @@ import config
 
 # localization
 try:
-    gettext.install('msec', str=1)
+    gettext.install('msec')
 except IOError:
     _ = str
 
diff --git a/src/msec/plugins/sudo.py b/src/msec/plugins/sudo.py
index 2df7fbd..1f9eddd 100755
--- a/src/msec/plugins/sudo.py
+++ b/src/msec/plugins/sudo.py
@@ -14,7 +14,7 @@ import config
 
 # localization
 try:
-    gettext.install('msec', str=1)
+    gettext.install('msec')
 except IOError:
     _ = str
 
diff --git a/src/msec/tools.py b/src/msec/tools.py
index 28c303b..baaeca2 100755
--- a/src/msec/tools.py
+++ b/src/msec/tools.py
@@ -14,7 +14,7 @@ from config import Narg, SYS_ENC
 # localization
 import gettext
 try:
-    gettext.install("msec", str=1)
+    gettext.install("msec")
 except IOError:
     _ = str
 
-- 
2.3.8

Actions: View | Diff

Attachments on bug 16524: 6881 | 6883 | 6884 | 6885 | 6886 | 6898 | 6899 | 6900 | 6901 | 6913 | 6922 | 6928