Python3 support in policycoreutils
Hi all,
This updates almost everything to be compatible with both python2 and 3. It still uses setools3 tho and the C module. I have a work in progress for updating sepolicy to use setools4 but those will come later.
-- Jason
PATCH 1/12 semanage: py3 support for print function and map/filter
map and filter were turned into list comprehensions. This was done using python's 2to3 utility.
--- policycoreutils/semanage/seobject.py | 94 +++++++++++++++---------------- policycoreutils/semanage/test-semanage.py | 2 +- 2 files changed, 48 insertions(+), 48 deletions(-)
policycoreutils/semanage/seobject.py +47 -47
@@ -336,7 +336,7 @@ class moduleRecords(semanageRecords): all = self.get_all() if len(all) == 0: return - return map(lambda x: "-d %s" % x[0], filter(lambda t: t[1] == 0, all)) + return ["-d %s" % x[0] for x in [t for t in all if t[1] == 0]] def list(self, heading=1, locallist=0): all = self.get_all()
@@ -344,7 +344,7 @@ class moduleRecords(semanageRecords): return if heading: - print "\n%-25s %-9s %s\n" % (_("Module Name"), _("Priority"), _("Language")) + print("\n%-25s %-9s %s\n" % (_("Module Name"), _("Priority"), _("Language"))) for t in all: if t[1] == 0: disabled = _("Disabled")
@@ -352,7 +352,7 @@ class moduleRecords(semanageRecords): if locallist: continue disabled = "" - print "%-25s %-9s %-5s %s" % (t[0], t[2], t[3], disabled) + print("%-25s %-9s %-5s %s" % (t[0], t[2], t[3], disabled)) def add(self, file, priority): if not os.path.exists(file):
@@ -402,7 +402,7 @@ class moduleRecords(semanageRecords): self.commit() def deleteall(self): - l = map(lambda x: x[0], filter(lambda t: t[1] == 0, self.get_all())) + l = [x[0] for x in [t for t in self.get_all() if t[1] == 0]] for m in l: self.set_enabled(m, True)
@@ -439,24 +439,24 @@ class permissiveRecords(semanageRecords): return l def list(self, heading=1, locallist=0): - all = map(lambda y: y["name"], filter(lambda x: x["permissive"], sepolicy.info(sepolicy.TYPE))) + all = [y["name"] for y in [x for x in sepolicy.info(sepolicy.TYPE) if x["permissive"]]] if len(all) == 0: return if heading: - print "\n%-25s\n" % (_("Builtin Permissive Types")) + print("\n%-25s\n" % (_("Builtin Permissive Types"))) customized = self.get_all() for t in all: if t not in customized: - print t + print(t) if len(customized) == 0: return if heading: - print "\n%-25s\n" % (_("Customized Permissive Types")) + print("\n%-25s\n" % (_("Customized Permissive Types"))) for t in customized: - print t + print(t) def add(self, type): import glob
@@ -564,7 +564,7 @@ class loginRecords(semanageRecords): self.begin() self.__add(name, sename, serange) self.commit() - except ValueError, error: + except ValueError as error: self.mylog.commit(0) raise error
@@ -624,7 +624,7 @@ class loginRecords(semanageRecords): self.begin() self.__modify(name, sename, serange) self.commit() - except ValueError, error: + except ValueError as error: self.mylog.commit(0) raise error
@@ -666,7 +666,7 @@ class loginRecords(semanageRecords): self.__delete(name) self.commit() - except ValueError, error: + except ValueError as error: self.mylog.commit(0) raise error
@@ -680,7 +680,7 @@ class loginRecords(semanageRecords): for u in ulist: self.__delete(semanage_seuser_get_name(u)) self.commit() - except ValueError, error: + except ValueError as error: self.mylog.commit(0) raise error
@@ -734,21 +734,21 @@ class loginRecords(semanageRecords): if is_mls_enabled == 1: if heading: - print "\n%-20s %-20s %-20s %s\n" % (_("Login Name"), _("SELinux User"), _("MLS/MCS Range"), _("Service")) + print("\n%-20s %-20s %-20s %s\n" % (_("Login Name"), _("SELinux User"), _("MLS/MCS Range"), _("Service"))) for k in keys: u = ddict[k] - print "%-20s %-20s %-20s %s" % (k, u[0], translate(u[1]), u[2]) + print("%-20s %-20s %-20s %s" % (k, u[0], translate(u[1]), u[2])) if len(lkeys): - print "\nLocal customization in %s" % self.logins_path + print("\nLocal customization in %s" % self.logins_path) for k in lkeys: u = ldict[k] - print "%-20s %-20s %-20s %s" % (k, u[0], translate(u[1]), u[2]) + print("%-20s %-20s %-20s %s" % (k, u[0], translate(u[1]), u[2])) else: if heading: - print "\n%-25s %-25s\n" % (_("Login Name"), _("SELinux User")) + print("\n%-25s %-25s\n" % (_("Login Name"), _("SELinux User"))) for k in keys: - print "%-25s %-25s" % (k, ddict[k][0]) + print("%-25s %-25s" % (k, ddict[k][0])) class seluserRecords(semanageRecords):
@@ -839,7 +839,7 @@ class seluserRecords(semanageRecords): self.begin() self.__add(name, roles, selevel, serange, prefix) self.commit() - except ValueError, error: + except ValueError as error: self.mylog.commit(0) raise error
@@ -904,7 +904,7 @@ class seluserRecords(semanageRecords): self.begin() self.__modify(name, roles, selevel, serange, prefix) self.commit() - except ValueError, error: + except ValueError as error: self.mylog.commit(0) raise error
@@ -947,7 +947,7 @@ class seluserRecords(semanageRecords): self.__delete(name) self.commit() - except ValueError, error: + except ValueError as error: self.mylog.commit(0) raise error
@@ -961,7 +961,7 @@ class seluserRecords(semanageRecords): for u in ulist: self.__delete(semanage_user_get_name(u)) self.commit() - except ValueError, error: + except ValueError as error: self.mylog.commit(0) raise error
@@ -1003,15 +1003,15 @@ class seluserRecords(semanageRecords): if is_mls_enabled == 1: if heading: - print "\n%-15s %-10s %-10s %-30s" % ("", _("Labeling"), _("MLS/"), _("MLS/")) - print "%-15s %-10s %-10s %-30s %s\n" % (_("SELinux User"), _("Prefix"), _("MCS Level"), _("MCS Range"), _("SELinux Roles")) + print("\n%-15s %-10s %-10s %-30s" % ("", _("Labeling"), _("MLS/"), _("MLS/"))) + print("%-15s %-10s %-10s %-30s %s\n" % (_("SELinux User"), _("Prefix"), _("MCS Level"), _("MCS Range"), _("SELinux Roles"))) for k in keys: - print "%-15s %-10s %-10s %-30s %s" % (k, ddict[k][0], translate(ddict[k][1]), translate(ddict[k][2]), ddict[k][3]) + print("%-15s %-10s %-10s %-30s %s" % (k, ddict[k][0], translate(ddict[k][1]), translate(ddict[k][2]), ddict[k][3])) else: if heading: - print "%-15s %s\n" % (_("SELinux User"), _("SELinux Roles")) + print("%-15s %s\n" % (_("SELinux User"), _("SELinux Roles"))) for k in keys: - print "%-15s %s" % (k, ddict[k][3]) + print("%-15s %s" % (k, ddict[k][3])) class portRecords(semanageRecords):
@@ -1268,13 +1268,13 @@ class portRecords(semanageRecords): keys.sort() if heading: - print "%-30s %-8s %s\n" % (_("SELinux Port Type"), _("Proto"), _("Port Number")) + print("%-30s %-8s %s\n" % (_("SELinux Port Type"), _("Proto"), _("Port Number"))) for i in keys: rec = "%-30s %-8s " % i rec += "%s" % ddict[i][0] for p in ddict[i][1:]: rec += ", %s" % p - print rec + print(rec) class nodeRecords(semanageRecords):
@@ -1502,16 +1502,16 @@ class nodeRecords(semanageRecords): keys.sort() if heading: - print "%-18s %-18s %-5s %-5s\n" % ("IP Address", "Netmask", "Protocol", "Context") + print("%-18s %-18s %-5s %-5s\n" % ("IP Address", "Netmask", "Protocol", "Context")) if is_mls_enabled: for k in keys: val = '' for fields in k: val = val + '\t' + str(fields) - print "%-18s %-18s %-5s %s:%s:%s:%s " % (k[0], k[1], k[2], ddict[k][0], ddict[k][1], ddict[k][2], translate(ddict[k][3], False)) + print("%-18s %-18s %-5s %s:%s:%s:%s " % (k[0], k[1], k[2], ddict[k][0], ddict[k][1], ddict[k][2], translate(ddict[k][3], False))) else: for k in keys: - print "%-18s %-18s %-5s %s:%s:%s " % (k[0], k[1], k[2], ddict[k][0], ddict[k][1], ddict[k][2]) + print("%-18s %-18s %-5s %s:%s:%s " % (k[0], k[1], k[2], ddict[k][0], ddict[k][1], ddict[k][2])) class interfaceRecords(semanageRecords):
@@ -1693,13 +1693,13 @@ class interfaceRecords(semanageRecords): keys.sort() if heading: - print "%-30s %s\n" % (_("SELinux Interface"), _("Context")) + print("%-30s %s\n" % (_("SELinux Interface"), _("Context"))) if is_mls_enabled: for k in keys: - print "%-30s %s:%s:%s:%s " % (k, ddict[k][0], ddict[k][1], ddict[k][2], translate(ddict[k][3], False)) + print("%-30s %s:%s:%s:%s " % (k, ddict[k][0], ddict[k][1], ddict[k][2], translate(ddict[k][3], False))) else: for k in keys: - print "%-30s %s:%s:%s " % (k, ddict[k][0], ddict[k][1], ddict[k][2]) + print("%-30s %s:%s:%s " % (k, ddict[k][0], ddict[k][1], ddict[k][2])) class fcontextRecords(semanageRecords):
@@ -2048,28 +2048,28 @@ class fcontextRecords(semanageRecords): if len(keys) != 0: keys.sort() if heading: - print "%-50s %-18s %s\n" % (_("SELinux fcontext"), _("type"), _("Context")) + print("%-50s %-18s %s\n" % (_("SELinux fcontext"), _("type"), _("Context"))) for k in keys: if fcon_dict[k]: if is_mls_enabled: - print "%-50s %-18s %s:%s:%s:%s " % (k[0], k[1], fcon_dict[k][0], fcon_dict[k][1], fcon_dict[k][2], translate(fcon_dict[k][3], False)) + print("%-50s %-18s %s:%s:%s:%s " % (k[0], k[1], fcon_dict[k][0], fcon_dict[k][1], fcon_dict[k][2], translate(fcon_dict[k][3], False))) else: - print "%-50s %-18s %s:%s:%s " % (k[0], k[1], fcon_dict[k][0], fcon_dict[k][1], fcon_dict[k][2]) + print("%-50s %-18s %s:%s:%s " % (k[0], k[1], fcon_dict[k][0], fcon_dict[k][1], fcon_dict[k][2])) else: - print "%-50s %-18s <<None>>" % (k[0], k[1]) + print("%-50s %-18s <<None>>" % (k[0], k[1])) if len(self.equiv_dist): if not locallist: if heading: - print _("\nSELinux Distribution fcontext Equivalence \n") + print(_("\nSELinux Distribution fcontext Equivalence \n")) for target in self.equiv_dist.keys(): - print "%s = %s" % (target, self.equiv_dist[target]) + print("%s = %s" % (target, self.equiv_dist[target])) if len(self.equiv): if heading: - print _("\nSELinux Local fcontext Equivalence \n") + print(_("\nSELinux Local fcontext Equivalence \n")) for target in self.equiv.keys(): - print "%s = %s" % (target, self.equiv[target]) + print("%s = %s" % (target, self.equiv[target])) class booleanRecords(semanageRecords):
@@ -2237,7 +2237,7 @@ class booleanRecords(semanageRecords): keys = ddict.keys() for k in keys: if ddict[k]: - print "%s=%s" % (k, ddict[k][2]) + print("%s=%s" % (k, ddict[k][2])) return ddict = self.get_all(locallist) keys = ddict.keys()
@@ -2245,7 +2245,7 @@ class booleanRecords(semanageRecords): return if heading: - print "%-30s %s %s %s\n" % (_("SELinux boolean"), _("State"), _("Default"), _("Description")) + print("%-30s %s %s %s\n" % (_("SELinux boolean"), _("State"), _("Default"), _("Description"))) for k in keys: if ddict[k]: - print "%-30s (%-5s,%5s) %s" % (k, on_off[selinux.security_get_boolean_active(k)], on_off[ddict[k][2]], self.get_desc(k)) + print("%-30s (%-5s,%5s) %s" % (k, on_off[selinux.security_get_boolean_active(k)], on_off[ddict[k][2]], self.get_desc(k)))
policycoreutils/semanage/test-semanage.py +1 -1
@@ -278,7 +278,7 @@ def gen_semanage_test_args(parser): if __name__ == "__main__": import selinux - semanage_test_list = filter(lambda x: x.startswith("test_"), dir(SemanageTests)) + semanage_test_list = [x for x in dir(SemanageTests) if x.startswith("test_")] if selinux.security_getenforce() == 1: parser = argparse.ArgumentParser(description='Semanage unit test script') gen_semanage_test_args(parser)
Signature · 1 line
2.7.3
PATCH 2/12 seobject: use sorted() instead of .sort()
In reply to Jason Zaman2to3 wanted to wrap all the .keys() calls in list() but doing sorted() directly is better.
--- policycoreutils/semanage/seobject.py | 68 ++++++++++++------------------------ 1 file changed, 22 insertions(+), 46 deletions(-)
policycoreutils/semanage/seobject.py +22 -46
@@ -716,21 +716,17 @@ class loginRecords(semanageRecords): def customized(self): l = [] ddict = self.get_all(True) - keys = ddict.keys() - keys.sort() - for k in keys: + for k in sorted(ddict.keys()): l.append("-a -s %s -r '%s' %s" % (ddict[k][0], ddict[k][1], k)) return l def list(self, heading=1, locallist=0): ddict = self.get_all(locallist) ldict = self.get_all_logins() - lkeys = ldict.keys() - keys = ddict.keys() + lkeys = sorted(ldict.keys()) + keys = sorted(ddict.keys()) if len(keys) == 0 and len(lkeys) == 0: return - keys.sort() - lkeys.sort() if is_mls_enabled == 1: if heading:
@@ -988,18 +984,15 @@ class seluserRecords(semanageRecords): def customized(self): l = [] ddict = self.get_all(True) - keys = ddict.keys() - keys.sort() - for k in keys: + for k in sorted(ddict.keys()): l.append("-a -L %s -r %s -R '%s' %s" % (ddict[k][1], ddict[k][2], ddict[k][3], k)) return l def list(self, heading=1, locallist=0): ddict = self.get_all(locallist) - keys = ddict.keys() - if len(keys) == 0: + if len(ddict) == 0: return - keys.sort() + keys = sorted(ddict.keys()) if is_mls_enabled == 1: if heading:
@@ -1251,9 +1244,7 @@ class portRecords(semanageRecords): def customized(self): l = [] ddict = self.get_all(True) - keys = ddict.keys() - keys.sort() - for k in keys: + for k in sorted(ddict.keys()): if k[0] == k[1]: l.append("-a -t %s -p %s %s" % (ddict[k][0], k[2], k[0])) else:
@@ -1262,10 +1253,9 @@ class portRecords(semanageRecords): def list(self, heading=1, locallist=0): ddict = self.get_all_by_type(locallist) - keys = ddict.keys() - if len(keys) == 0: + if len(ddict) == 0: return - keys.sort() + keys = sorted(ddict.keys()) if heading: print("%-30s %-8s %s\n" % (_("SELinux Port Type"), _("Proto"), _("Port Number")))
@@ -1488,18 +1478,15 @@ class nodeRecords(semanageRecords): def customized(self): l = [] ddict = self.get_all(True) - keys = ddict.keys() - keys.sort() - for k in keys: + for k in sorted(ddict.keys()): l.append("-a -M %s -p %s -t %s %s" % (k[1], k[2], ddict[k][2], k[0])) return l def list(self, heading=1, locallist=0): ddict = self.get_all(locallist) - keys = ddict.keys() - if len(keys) == 0: + if len(ddict) == 0: return - keys.sort() + keys = sorted(ddict.keys()) if heading: print("%-18s %-18s %-5s %-5s\n" % ("IP Address", "Netmask", "Protocol", "Context"))
@@ -1679,18 +1666,15 @@ class interfaceRecords(semanageRecords): def customized(self): l = [] ddict = self.get_all(True) - keys = ddict.keys() - keys.sort() - for k in keys: + for k in sorted(ddict.keys()): l.append("-a -t %s %s" % (ddict[k][2], k)) return l def list(self, heading=1, locallist=0): ddict = self.get_all(locallist) - keys = ddict.keys() - if len(keys) == 0: + if len(ddict) == 0: return - keys.sort() + keys = sorted(ddict.keys()) if heading: print("%-30s %s\n" % (_("SELinux Interface"), _("Context")))
@@ -2031,9 +2015,7 @@ class fcontextRecords(semanageRecords): def customized(self): l = [] fcon_dict = self.get_all(True) - keys = fcon_dict.keys() - keys.sort() - for k in keys: + for k in sorted(fcon_dict.keys()): if fcon_dict[k]: l.append("-a -f %s -t %s '%s'" % (file_type_str_to_option[k[1]], fcon_dict[k][2], k[0]))
@@ -2044,12 +2026,10 @@ class fcontextRecords(semanageRecords): def list(self, heading=1, locallist=0): fcon_dict = self.get_all(locallist) - keys = fcon_dict.keys() - if len(keys) != 0: - keys.sort() + if len(fcon_dict) != 0: if heading: print("%-50s %-18s %s\n" % (_("SELinux fcontext"), _("type"), _("Context"))) - for k in keys: + for k in sorted(fcon_dict.keys()): if fcon_dict[k]: if is_mls_enabled: print("%-50s %-18s %s:%s:%s:%s " % (k[0], k[1], fcon_dict[k][0], fcon_dict[k][1], fcon_dict[k][2], translate(fcon_dict[k][3], False)))
@@ -2223,9 +2203,7 @@ class booleanRecords(semanageRecords): def customized(self): l = [] ddict = self.get_all(True) - keys = ddict.keys() - keys.sort() - for k in keys: + for k in sorted(ddict.keys()): if ddict[k]: l.append("-m -%s %s" % (ddict[k][2], k)) return l
@@ -2234,18 +2212,16 @@ class booleanRecords(semanageRecords): on_off = (_("off"), _("on")) if use_file: ddict = self.get_all(locallist) - keys = ddict.keys() - for k in keys: + for k in sorted(ddict.keys()): if ddict[k]: print("%s=%s" % (k, ddict[k][2])) return ddict = self.get_all(locallist) - keys = ddict.keys() - if len(keys) == 0: + if len(ddict) == 0: return if heading: print("%-30s %s %s %s\n" % (_("SELinux boolean"), _("State"), _("Default"), _("Description"))) - for k in keys: + for k in sorted(ddict.keys()): if ddict[k]: print("%-30s (%-5s,%5s) %s" % (k, on_off[selinux.security_get_boolean_active(k)], on_off[ddict[k][2]], self.get_desc(k)))
Signature · 1 line
2.7.3
PATCH 3/12 semanage: misc style issues
In reply to Jason ZamanUnused imports
== None should be is None
--- policycoreutils/semanage/semanage | 5 +++-- policycoreutils/semanage/seobject.py | 15 +++++---------- policycoreutils/semanage/test-semanage.py | 3 --- 3 files changed, 8 insertions(+), 15 deletions(-)
policycoreutils/semanage/semanage +3 -2
@@ -23,6 +23,7 @@ # # +import traceback import argparse import seobject import sys
@@ -111,7 +112,7 @@ class SetExportFile(argparse.Action): try: sys.stdout = open(values, 'w') except: - sys.stderr.write("%s: %s\n" % (e.__class__.__name__, str(e))) + sys.stderr.write(traceback.format_exc()) sys.exit(1) setattr(namespace, self.dest, values)
@@ -702,7 +703,7 @@ def handlePermissive(args): if args.action is "list": OBJECT.list(args.noheading) - elif args.type != None: + elif args.type is not None: if args.action is "add": OBJECT.add(args.type) if args.action is "delete":
policycoreutils/semanage/seobject.py +5 -10
@@ -23,14 +23,11 @@ import pwd import grp -import string import selinux -import tempfile import os import re import sys import stat -import shutil from semanage import * PROGNAME = "policycoreutils" import sepolicy
@@ -129,9 +126,9 @@ except: message += " role=" + serole if oldserole != "": message += " old_role=" + oldserole - if serange != "" and serange != None: + if serange != "" and serange is not None: message += " MLSRange=" + serange - if oldserange != "" and oldserange != None: + if oldserange != "" and oldserange is not None: message += " old_MLSRange=" + oldserange self.log_list.append(message)
@@ -416,7 +413,7 @@ class dontauditClass(semanageRecords): if dontaudit not in ["on", "off"]: raise ValueError(_("dontaudit requires either 'on' or 'off'")) self.begin() - rc = semanage_set_disable_dontaudit(self.sh, dontaudit == "off") + semanage_set_disable_dontaudit(self.sh, dontaudit == "off") self.commit()
@@ -459,7 +456,6 @@ class permissiveRecords(semanageRecords): print(t) def add(self, type): - import glob try: import sepolgen.module as module except ImportError:
@@ -830,7 +826,6 @@ class seluserRecords(semanageRecords): self.mylog.log("seuser", sename=name, serole=",".join(roles), serange=serange) def add(self, name, roles, selevel, serange, prefix): - serole = " ".join(roles) try: self.begin() self.__add(name, roles, selevel, serange, prefix)
@@ -1897,7 +1892,7 @@ class fcontextRecords(semanageRecords): if setype != "<<none>>": con = semanage_fcontext_get_con(fcontext) - if con == None: + if con is None: con = self.createcon(target) if (is_mls_enabled == 1) and (serange != ""):
@@ -2071,7 +2066,7 @@ class booleanRecords(semanageRecords): self.current_booleans = [] ptype = None - if self.store == None or self.store == ptype: + if self.store is None or self.store == ptype: self.modify_local = True else: self.modify_local = False
policycoreutils/semanage/test-semanage.py +0 -3
@@ -1,8 +1,5 @@ import unittest -import os -import shutil import sys -from tempfile import mkdtemp from subprocess import Popen, PIPE import argparse
Signature · 1 line
2.7.3
PATCH 4/12 sepolicy: Add python3 PyInt and PyString defs
In reply to Jason Zaman--- policycoreutils/sepolicy/common.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
policycoreutils/sepolicy/common.h +19 -0
@@ -11,6 +11,25 @@#define py_decref (x) { if (x) Py_DECREF(x); } +#if PY_MAJOR_VERSION >=3 +# define PyIntObject PyLongObject +# define PyInt_Type PyLong_Type +# define PyInt_Check (op) PyLong_Check(op) +# define PyInt_CheckExact (op) PyLong_CheckExact(op) +# define PyInt_FromString PyLong_FromString +# define PyInt_FromUnicode PyLong_FromUnicode +# define PyInt_FromLong PyLong_FromLong +# define PyInt_FromSize_t PyLong_FromSize_t +# define PyInt_FromSsize_t PyLong_FromSsize_t +# define PyInt_AsLong PyLong_AsLong +# define PyInt_AS_LONG PyLong_AS_LONG +# define PyInt_AsSsize_t PyLong_AsSsize_t +# define PyInt_AsUnsignedLongMask PyLong_AsUnsignedLongMask +# define PyInt_AsUnsignedLongLongMask PyLong_AsUnsignedLongLongMask +# define PyString_FromString PyUnicode_FromString +# define PyString_AsString PyUnicode_AsUTF8 +#endif +static int py_append_string (PyObject *list,const char * value) {int rt;
Signature · 1 line
2.7.3
PATCH 5/12 sepolicy: C Module init for python3
In reply to Jason Zaman--- policycoreutils/sepolicy/policy.c | 29 ++++++++++++++++++++++++--- policycoreutils/sepolicy/sepolicy/__init__.py | 2 +- 2 files changed, 27 insertions(+), 4 deletions(-)
policycoreutils/sepolicy/policy.c +26 -3
@@ -86,8 +86,31 @@ static PyMethodDef methods[] = { {NULL, NULL, 0, NULL} /* sentinel */ }; +#if PY_MAJOR_VERSION >=3 + +static struct PyModuleDef module_def = +{ + PyModuleDef_HEAD_INIT, +"_policy" ,/* name of module */ +"" ,/* module documentation, may be NULL */ +-1 ,/* size of per-interpreter state of the module, or -1 if the module keeps state in global variables. */ + (PyMethodDef *)&methods, +}; + +PyMODINIT_FUNC PyInit__policy (void ) +{ +PyObject *m; + m =PyModule_Create (&module_def); +init_info (m); +return m; +} + +#else // python 2 +void init_policy (void ) { -PyObject *m; -m =Py_InitModule ("_policy" , methods); -init_info (m); +PyObject *m; + m =Py_InitModule ("_policy" , methods); +init_info (m); } + +#endif
policycoreutils/sepolicy/sepolicy/__init__.py +1 -1
@@ -3,7 +3,7 @@ # Author: Dan Walsh <[email protected]> # Author: Ryan Hallisey <[email protected]> -import _policy +from . import _policy import selinux import glob PROGNAME = "policycoreutils"
Signature · 1 line
2.7.3
PATCH 6/12 sepolicy: update exceptions and print for python3
In reply to Jason Zaman--- policycoreutils/sepolicy/sepolicy/__init__.py | 26 ++++++------ policycoreutils/sepolicy/sepolicy/generate.py | 55 +++++++++++++------------ policycoreutils/sepolicy/sepolicy/gui.py | 32 +++++++------- policycoreutils/sepolicy/sepolicy/interface.py | 8 ++-- policycoreutils/sepolicy/sepolicy/manpage.py | 53 +++++++++++------------- policycoreutils/sepolicy/sepolicy/sedbus.py | 6 +-- policycoreutils/sepolicy/sepolicy/transition.py | 2 +- 7 files changed, 89 insertions(+), 93 deletions(-)
policycoreutils/sepolicy/sepolicy/__init__.py +12 -14
@@ -11,6 +11,10 @@ import gettext import sepolgen.defaults as defaults import sepolgen.interfaces as interfaces import sys +import os +import re +import gzip + gettext.bindtextdomain(PROGNAME, "/usr/share/locale") gettext.textdomain(PROGNAME) try:
@@ -140,7 +144,7 @@ def get_writable_files(setype): all_writes = [] mpaths = {} permlist = search([ALLOW], {'source': setype, 'permlist': ['open', 'write'], 'class': 'file'}) - if permlist == None or len(permlist) == 0: + if permlist is None or len(permlist) == 0: return mpaths fcdict = get_fcdict()
@@ -170,10 +174,6 @@ def get_writable_files(setype): mpaths[f] = [] # {"regex":[],"paths":[]} return mpaths -import os -import re -import sys - def find_file(reg): if os.path.exists(reg):
@@ -181,7 +181,7 @@ def find_file(reg): try: pat = re.compile(r"%s$" % reg) except: - print "bad reg:", reg + print("bad reg:", reg) return [] p = reg if p.endswith("(/.*)?"):
@@ -193,7 +193,7 @@ def find_file(reg): if path[-1] != "/": # is pass in it breaks without try block path += "/" except IndexError: - print "try failed got an IndexError" + print("try failed got an IndexError") pass try:
@@ -464,7 +464,7 @@ all_types = None def get_all_types(): global all_types - if all_types == None: + if all_types is None: all_types = map(lambda x: x['name'], info(TYPE)) return all_types
@@ -473,7 +473,7 @@ user_types = None def get_user_types(): global user_types - if user_types == None: + if user_types is None: user_types = info(ATTRIBUTE, "userdomain")[0]["types"] return user_types
@@ -525,7 +525,7 @@ def gen_interfaces(): if os.getuid() != 0: raise ValueError(_("You must regenerate interface info by running /usr/bin/sepolgen-ifgen")) - print commands.getstatusoutput("/usr/bin/sepolgen-ifgen")[1] + print(commands.getstatusoutput("/usr/bin/sepolgen-ifgen")[1]) def gen_port_dict():
@@ -797,7 +797,7 @@ def policy(policy_file): try: policy_file = get_installed_policy() policy(policy_file) -except ValueError, e: +except ValueError as e: if selinux.is_selinux_enabled() == 1: raise e
@@ -854,7 +854,6 @@ def get_all_booleans(): return booleans booleans_dict = None -import gzip def policy_xml(path="/usr/share/selinux/devel/policy.xml"):
@@ -874,7 +873,6 @@ def gen_bool_dict(path="/usr/share/selinux/devel/policy.xml"): if booleans_dict: return booleans_dict import xml.etree.ElementTree - import re booleans_dict = {} try: tree = xml.etree.ElementTree.fromstring(policy_xml(path))
@@ -896,7 +894,7 @@ def gen_bool_dict(path="/usr/share/selinux/devel/policy.xml"): desc = i.find("desc").find("p").text.strip("\n") desc = re.sub("\n", " ", desc) booleans_dict[i.get('name')] = ("global", i.get('dftval'), desc) - except IOError, e: + except IOError: pass return booleans_dict
policycoreutils/sepolicy/sepolicy/generate.py +28 -27
170 lines not on this page · raw message
policycoreutils/sepolicy/sepolicy/gui.py +16 -16
@@ -110,8 +110,8 @@ class SELinuxGui(): self.dbus = SELinuxDBus() try: customized = self.dbus.customized() - except dbus.exceptions.DBusException, e: - print e + except dbus.exceptions.DBusException as e: + print(e) self.quit() sepolicy_domains = sepolicy.get_all_domains()
@@ -818,7 +818,7 @@ class SELinuxGui(): self.set_application_label = True def resize_wrap(self, *args): - print args + print(args) def initialize_system_default_mode(self): self.enforce_mode = selinux.selinux_getenforcemode()[1]
@@ -851,12 +851,12 @@ class SELinuxGui(): for x in range(0, list.get_n_columns()): try: val = list.get_value(iter, x) - if val == True or val == False or val == None: + if val is True or val is False or val is None: continue # Returns true if filter_txt exists within the val if(val.find(self.filter_txt) != -1 or val.lower().find(self.filter_txt) != -1): return True - except AttributeError, TypeError: + except (AttributeError, TypeError): pass except: # ValueError: pass
@@ -959,7 +959,7 @@ class SELinuxGui(): return liststore.get_value(iter, 0) def combo_box_initialize(self, val, desc): - if val == None: + if val is None: return iter = self.combobox_menu_model.append() for f in val:
@@ -968,7 +968,7 @@ class SELinuxGui(): def select_type_more(self, *args): app = self.moreTypes_treeview.get_selection() iter = app.get_selected()[1] - if iter == None: + if iter is None: return app = self.more_types_files_liststore.get_value(iter, 0) self.combo_set_active_text(self.files_type_combobox, app)
@@ -980,7 +980,7 @@ class SELinuxGui(): iter = model.convert_iter_to_child_iter(iter) iter = self.advanced_search_filter.convert_iter_to_child_iter(iter) app = self.advanced_search_liststore.get_value(iter, 1) - if app == None: + if app is None: return self.advanced_filter_entry.set_text('') self.advanced_search_window.hide()
@@ -1172,7 +1172,7 @@ class SELinuxGui(): def files_initial_data_insert(self, liststore, path, seLinux_label, file_class): iter = liststore.append(None) - if path == None: + if path is None: path = _("MISSING FILE PATH") modify = False else:
@@ -1669,7 +1669,7 @@ class SELinuxGui(): self.more_types_files_liststore.set_value(iter, 0, app) self.files_class_combobox.set_active(0) except AttributeError: - print "error" + print("error") pass self.files_type_combobox.set_active(0) self.files_mls_entry.set_text("s0")
@@ -1811,7 +1811,7 @@ class SELinuxGui(): self.wait_mouse() try: self.dbus.semanage(update_buffer) - except dbus.exceptions.DBusException, e: + except dbus.exceptions.DBusException as e: self.error(e) self.ready_mouse()
@@ -1890,7 +1890,7 @@ class SELinuxGui(): tree.set_value(iter, 2, fclass) def restore_to_default(self, *args): - print "restore to defualt clicked..." + print("restore to defualt clicked...") def invalid_entry_retry(self, *args): self.closewindow(self.error_check_window)
@@ -2143,7 +2143,7 @@ class SELinuxGui(): def on_save_delete_file_equiv_clicked(self, *args): for delete in self.files_delete_liststore: - print delete[0], delete[1], delete[2], + print(delete[0], delete[1], delete[2],) def on_toggle_update(self, cell, path, model): model[path][0] = not model[path][0]
@@ -2451,8 +2451,8 @@ class SELinuxGui(): self.wait_mouse() try: self.dbus.semanage(update_buffer) - except dbus.exceptions.DBusException, e: - print e + except dbus.exceptions.DBusException as e: + print(e) self.ready_mouse() self.init_cur()
@@ -2735,7 +2735,7 @@ class SELinuxGui(): return try: self.dbus.relabel_on_boot(active) - except dbus.exceptions.DBusException, e: + except dbus.exceptions.DBusException as e: self.error(e) def closewindow(self, window, *args):
policycoreutils/sepolicy/sepolicy/interface.py +4 -4
@@ -79,7 +79,7 @@ def get_admin(path=""): for k in idict.keys(): if k.endswith("_admin"): admin_list.append(k) - except IOError, e: + except IOError as e: sys.stderr.write("%s: %s\n" % (e.__class__.__name__, str(e))) sys.exit(1) else:
@@ -102,7 +102,7 @@ def get_user(path=""): if k.endswith("_role"): if (("%s_exec_t" % k[:-5]) in sepolicy.get_all_types()): trans_list.append(k) - except IOError, e: + except IOError as e: sys.stderr.write("%s: %s\n" % (e.__class__.__name__, str(e))) sys.exit(1) else:
@@ -154,7 +154,7 @@ def get_interface_dict(path="/usr/share/selinux/devel/policy.xml"): param_list.append(e.get('name')) interface_dict[(i.get("name"))] = [param_list, (i.find('summary').text), "template"] param_list = [] - except IOError, e: + except IOError: pass return interface_dict
@@ -220,7 +220,7 @@ def interface_compile_test(interface, path="/usr/share/selinux/devel/policy.xml" sys.stderr.write(output) sys.stderr.write(_("\nCompile test for %s failed.\n") % interface) - except EnvironmentError, e: + except EnvironmentError as e: sys.stderr.write(_("\nCompile test for %s has not run. %s\n") % (interface, e)) for v in policy_files.values(): if os.path.exists(v):
policycoreutils/sepolicy/sepolicy/manpage.py +25 -28
193 lines not on this page · raw message
policycoreutils/sepolicy/sepolicy/sedbus.py +3 -3
@@ -55,6 +55,6 @@ if __name__ == "__main__": try: dbus_proxy = SELinuxDBus() resp = dbus_proxy.setenforce(int(sys.argv[1])) - print (resp) - except dbus.DBusException, e: - print e + print(resp) + except dbus.DBusException as e: + print(e)
policycoreutils/sepolicy/sepolicy/transition.py +1 -1
@@ -81,4 +81,4 @@ class setrans: def output(self): self.seen = [] - print self.out(self.source) + print(self.out(self.source))
Signature · 1 line
2.7.3
PATCH 7/12 sepolicy: dont alias sepolicy.search and sepolicy.info
In reply to Jason Zaman--- policycoreutils/sepolicy/sepolicy/booleans.py | 7 ++--- policycoreutils/sepolicy/sepolicy/communicate.py | 6 ++--- policycoreutils/sepolicy/sepolicy/gui.py | 1 - policycoreutils/sepolicy/sepolicy/manpage.py | 34 +++++++++++------------- policycoreutils/sepolicy/sepolicy/network.py | 4 +-- policycoreutils/sepolicy/sepolicy/transition.py | 8 +++--- 6 files changed, 24 insertions(+), 36 deletions(-)
policycoreutils/sepolicy/sepolicy/booleans.py +2 -5
@@ -21,20 +21,17 @@ # # import sepolicy -import sys -search = sepolicy.search -info = sepolicy.info def expand_attribute(attribute): try: - return info(sepolicy.ATTRIBUTE, attribute)[0]["types"] + return sepolicy.info(sepolicy.ATTRIBUTE, attribute)[0]["types"] except RuntimeError: return [attribute] def get_types(src, tclass, perm): - allows = search([sepolicy.ALLOW], {sepolicy.SOURCE: src, sepolicy.CLASS: tclass, sepolicy.PERMS: perm}) + allows = sepolicy.search([sepolicy.ALLOW], {sepolicy.SOURCE: src, sepolicy.CLASS: tclass, sepolicy.PERMS: perm}) if not allows: raise TypeError("The %s type is not allowed to %s any types" % (src, ",".join(perm)))
policycoreutils/sepolicy/sepolicy/communicate.py +2 -4
@@ -22,8 +22,6 @@ # import sepolicy import sys -search = sepolicy.search -info = sepolicy.info def usage(parser, msg):
@@ -36,13 +34,13 @@ def usage(parser, msg): def expand_attribute(attribute): try: - return info(sepolicy.ATTRIBUTE, attribute)[0]["types"] + return sepolicy.info(sepolicy.ATTRIBUTE, attribute)[0]["types"] except RuntimeError: return [attribute] def get_types(src, tclass, perm): - allows = search([sepolicy.ALLOW], {sepolicy.SOURCE: src, sepolicy.CLASS: tclass, sepolicy.PERMS: perm}) + allows = sepolicy.search([sepolicy.ALLOW], {sepolicy.SOURCE: src, sepolicy.CLASS: tclass, sepolicy.PERMS: perm}) if not allows: raise ValueError("The %s type is not allowed to %s any types" % (src, ",".join(perm)))
policycoreutils/sepolicy/sepolicy/gui.py +0 -1
@@ -37,7 +37,6 @@ from selinux import DISABLED, PERMISSIVE, ENFORCING import sepolicy.network import sepolicy.manpage import dbus -import time import os import re import gettext
policycoreutils/sepolicy/sepolicy/manpage.py +16 -18
@@ -27,8 +27,6 @@ __all__ = ['ManPage', 'HTMLManPages', 'manpage_domains', 'manpage_roles', 'gen_d import string import selinux import sepolicy -from sepolicy import * - import commands import os import time
@@ -47,7 +45,7 @@ def gen_modules_dict(path="/usr/share/selinux/devel/policy.xml"): import xml.etree.ElementTree modules_dict = {} try: - tree = xml.etree.ElementTree.fromstring(policy_xml(path)) + tree = xml.etree.ElementTree.fromstring(sepolicy.policy_xml(path)) for l in tree.findall("layer"): for m in l.findall("module"): name = m.get("name")
@@ -76,7 +74,7 @@ def get_all_users_info(): users = [] users_range = {} allusers = [] - allusers_info = info(USER) + allusers_info = sepolicy.info(sepolicy.USER) for d in allusers_info: allusers.append(d['name'])
@@ -105,7 +103,7 @@ def gen_domains(): if domains: return domains domains = [] - for d in get_all_domains(): + for d in sepolicy.get_all_domains(): found = False domain = d[:-2] # if domain + "_exec_t" not in get_entrypoints():
@@ -114,7 +112,7 @@ def gen_domains(): continue domains.append(domain) - for role in get_all_roles(): + for role in sepolicy.get_all_roles(): if role[:-2] in domains or role == "system_r": continue domains.append(role[:-2])
@@ -404,17 +402,17 @@ class ManPage: self.html = html self.source_files = source_files self.root = root - self.portrecs = gen_port_dict()[0] + self.portrecs = sepolicy.gen_port_dict()[0] self.domains = gen_domains() - self.all_domains = get_all_domains() - self.all_attributes = get_all_attributes() - self.all_bools = get_all_bools() - self.all_port_types = get_all_port_types() - self.all_roles = get_all_roles() + self.all_domains = sepolicy.get_all_domains() + self.all_attributes = sepolicy.get_all_attributes() + self.all_bools = sepolicy.get_all_bools() + self.all_port_types = sepolicy.get_all_port_types() + self.all_roles = sepolicy.get_all_roles() self.all_users = get_all_users_info()[0] self.all_users_range = get_all_users_info()[1] - self.all_file_types = get_all_file_types() - self.role_allows = get_all_role_allows() + self.all_file_types = sepolicy.get_all_file_types() + self.role_allows = sepolicy.get_all_role_allows() self.types = _gen_types() if self.source_files:
@@ -422,7 +420,7 @@ class ManPage: else: self.fcpath = self.root + selinux.selinux_file_context_path() - self.fcdict = get_fcdict(self.fcpath) + self.fcdict = sepolicy.get_fcdict(self.fcpath) if not os.path.exists(path): os.makedirs(path)
@@ -433,9 +431,9 @@ class ManPage: self.xmlpath = self.root + "policy.xml" else: self.xmlpath = self.root + "/usr/share/selinux/devel/policy.xml" - self.booleans_dict = gen_bool_dict(self.xmlpath) + self.booleans_dict = sepolicy.gen_bool_dict(self.xmlpath) - self.domainname, self.short_name = gen_short_name(domainname) + self.domainname, self.short_name = sepolicy.gen_short_name(domainname) self.type = self.domainname + "_t" self._gen_bools()
@@ -466,7 +464,7 @@ class ManPage: types.append(t + "_t") for t in types: - domainbools, bools = get_bools(t) + domainbools, bools = sepolicy.get_bools(t) self.bools += bools self.domainbools += domainbools
policycoreutils/sepolicy/sepolicy/network.py +1 -3
@@ -21,12 +21,10 @@ # # import sepolicy -search = sepolicy.search -info = sepolicy.info def get_types(src, tclass, perm): - allows = search([sepolicy.ALLOW], {sepolicy.SOURCE: src, sepolicy.CLASS: tclass, sepolicy.PERMS: perm}) + allows = sepolicy.search([sepolicy.ALLOW], {sepolicy.SOURCE: src, sepolicy.CLASS: tclass, sepolicy.PERMS: perm}) nlist = [] if allows: for i in map(lambda y: y[sepolicy.TARGET], filter(lambda x: set(perm).issubset(x[sepolicy.PERMS]), allows)):
policycoreutils/sepolicy/sepolicy/transition.py +3 -5
@@ -21,18 +21,16 @@ # # import sepolicy -search = sepolicy.search -info = sepolicy.info -__all__ = ['setrans', ] +__all__ = ['setrans'] def _entrypoint(src): - trans = search([sepolicy.ALLOW], {sepolicy.SOURCE: src}) + trans = sepolicy.search([sepolicy.ALLOW], {sepolicy.SOURCE: src}) return map(lambda y: y[sepolicy.TARGET], filter(lambda x: "entrypoint" in x[sepolicy.PERMS], trans)) def _get_trans(src): - return search([sepolicy.TRANSITION], {sepolicy.SOURCE: src, sepolicy.CLASS: "process"}) + return sepolicy.search([sepolicy.TRANSITION], {sepolicy.SOURCE: src, sepolicy.CLASS: "process"}) class setrans:
Signature · 1 line
2.7.3
PATCH 8/12 policycoreutils: import sepolicy directly
In reply to Jason Zamaninstead of from sepolicy import foo. Makes it easier to grep for consumers that still need to be fixed.
--- policycoreutils/gui/domainsPage.py | 4 +-- policycoreutils/gui/polgengui.py | 58 ++++++++++++++++++------------------ policycoreutils/semanage/seobject.py | 7 ++--- 3 files changed, 34 insertions(+), 35 deletions(-)
policycoreutils/gui/domainsPage.py +2 -2
@@ -25,8 +25,8 @@ import gobject import sys import seobject import selinux +import sepolicy from semanagePage import * -from sepolicy import get_all_entrypoint_domains ## ## I18N
@@ -70,7 +70,7 @@ class domainsPage(semanagePage): self.permissive_button = xml.get_widget("permissiveButton") self.enforcing_button = xml.get_widget("enforcingButton") - self.domains = get_all_entrypoint_domains() + self.domains = sepolicy.get_all_entrypoint_domains() self.load() def get_modules(self):
policycoreutils/gui/polgengui.py +29 -29
124 lines not on this page · raw message
policycoreutils/semanage/seobject.py +3 -4
@@ -31,8 +31,7 @@ import stat from semanage import * PROGNAME = "policycoreutils" import sepolicy -from sepolicy import boolean_desc, boolean_category, gen_bool_dict -gen_bool_dict() +sepolicy.gen_bool_dict() from IPy import IP import gettext
@@ -2189,11 +2188,11 @@ class booleanRecords(semanageRecords): def get_desc(self, name): name = selinux.selinux_boolean_sub(name) - return boolean_desc(name) + return sepolicy.boolean_desc(name) def get_category(self, name): name = selinux.selinux_boolean_sub(name) - return boolean_category(name) + return sepolicy.boolean_category(name) def customized(self): l = []
Signature · 1 line
2.7.3
Re: [PATCH 08/12] policycoreutils: import sepolicy directly
Quoted 2 lines · Jason Zaman
instead of from sepolicy import foo. Makes it easier to grep for consumers that still need to be fixed.
I think this broke audit2why.
$ cd policycoreutils/audit2allow
$ make test
test_audit2why (__main__.Audit2allowTests)
Verify audit2why works ... Traceback (most recent call last):
File "/bin/audit2why", line 365, in <module>
app.main()
File "/bin/audit2why", line 353, in main
self.__output()
File "/bin/audit2why", line 295, in __output
return self.__output_audit2why()
File "/bin/audit2why", line 263, in __output_audit2why
print("\tDescription:\n\t%s\n" % seobject.boolean_desc(b[0]))
AttributeError: 'module' object has no attribute 'boolean_desc'
FAILQuoted 192 lines
--- policycoreutils/gui/domainsPage.py | 4 +-- policycoreutils/gui/polgengui.py | 58 ++++++++++++++++++------------------ policycoreutils/semanage/seobject.py | 7 ++--- 3 files changed, 34 insertions(+), 35 deletions(-)policycoreutils/gui/domainsPage.py +2
-2@@ -25,8 +25,8 @@ import gobject import sys import seobject import selinux +import sepolicy from semanagePage import * -from sepolicy import get_all_entrypoint_domains ## ## I18N@@ -70,7 +70,7 @@ class domainsPage(semanagePage): self.permissive_button = xml.get_widget("permissiveButton") self.enforcing_button = xml.get_widget("enforcingButton") - self.domains = get_all_entrypoint_domains() + self.domains = sepolicy.get_all_entrypoint_domains() self.load() def get_modules(self):policycoreutils/gui/polgengui.py +29
-29@@ -29,7 +29,7 @@ import gobject import gnome import sys try: - from sepolicy import generate + import sepolicy except ValueError, e: sys.stderr.write("%s: %s\n" % (e.__class__.__name__, str(e))) sys.exit(1)@@ -194,10 +194,10 @@ class childWindow: self.tooltip_dict[label] = label.get_tooltip_text() try: - self.all_types = generate.get_all_types() + self.all_types = sepolicy.generate.get_all_types() self.all_modules = get_all_modules() - self.all_roles = generate.get_all_roles() - self.all_users = generate.get_all_users() + self.all_roles = sepolicy.generate.get_all_roles() + self.all_users = sepolicy.generate.get_all_users() except RuntimeError, e: self.all_types = [] self.all_modules = []@@ -225,16 +225,16 @@ class childWindow: self.boolean_description_entry = xml.get_widget("boolean_description_entry") self.pages = {} - for i in generate.USERS: + for i in sepolicy.generate.USERS: self.pages[i] = [self.SELECT_TYPE_PAGE, self.APP_PAGE, self.TRANSITION_PAGE, self.ROLE_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.BOOLEAN_PAGE, self.SELECT_DIR_PAGE] - self.pages[generate.RUSER] = [self.SELECT_TYPE_PAGE, self.APP_PAGE, self.ADMIN_PAGE, self.USER_TRANSITION_PAGE, self.BOOLEAN_PAGE, self.SELECT_DIR_PAGE] - self.pages[generate.LUSER] = [self.SELECT_TYPE_PAGE, self.APP_PAGE, self.TRANSITION_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.BOOLEAN_PAGE, self.SELECT_DIR_PAGE] - self.pages[generate.SANDBOX] = [self.SELECT_TYPE_PAGE, self.APP_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.BOOLEAN_PAGE, self.SELECT_DIR_PAGE] - self.pages[generate.EUSER] = [self.SELECT_TYPE_PAGE, self.EXISTING_USER_PAGE, self.TRANSITION_PAGE, self.ROLE_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.BOOLEAN_PAGE, self.SELECT_DIR_PAGE] + self.pages[sepolicy.generate.RUSER] = [self.SELECT_TYPE_PAGE, self.APP_PAGE, self.ADMIN_PAGE, self.USER_TRANSITION_PAGE, self.BOOLEAN_PAGE, self.SELECT_DIR_PAGE] + self.pages[sepolicy.generate.LUSER] = [self.SELECT_TYPE_PAGE, self.APP_PAGE, self.TRANSITION_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.BOOLEAN_PAGE, self.SELECT_DIR_PAGE] + self.pages[sepolicy.generate.SANDBOX] = [self.SELECT_TYPE_PAGE, self.APP_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.BOOLEAN_PAGE, self.SELECT_DIR_PAGE] + self.pages[sepolicy.generate.EUSER] = [self.SELECT_TYPE_PAGE, self.EXISTING_USER_PAGE, self.TRANSITION_PAGE, self.ROLE_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.BOOLEAN_PAGE, self.SELECT_DIR_PAGE] - for i in generate.APPLICATIONS: + for i in sepolicy.generate.APPLICATIONS: self.pages[i] = [self.SELECT_TYPE_PAGE, self.APP_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.COMMON_APPS_PAGE, self.FILES_PAGE, self.BOOLEAN_PAGE, self.SELECT_DIR_PAGE] - self.pages[generate.USER] = [self.SELECT_TYPE_PAGE, self.APP_PAGE, self.USER_TRANSITION_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.COMMON_APPS_PAGE, self.FILES_PAGE, self.BOOLEAN_PAGE, self.SELECT_DIR_PAGE] + self.pages[sepolicy.generate.USER] = [self.SELECT_TYPE_PAGE, self.APP_PAGE, self.USER_TRANSITION_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.COMMON_APPS_PAGE, self.FILES_PAGE, self.BOOLEAN_PAGE, self.SELECT_DIR_PAGE] self.current_page = 0 self.back_button.set_sensitive(0)@@ -340,7 +340,7 @@ class childWindow: self.error(e.message) def confine_application(self): - return self.get_type() in generate.APPLICATIONS + return self.get_type() in sepolicy.generate.APPLICATIONS def forward(self, arg): type = self.get_type()@@ -437,41 +437,41 @@ class childWindow: def get_type(self): if self.sandbox_radiobutton.get_active(): - return generate.SANDBOX + return sepolicy.generate.SANDBOX if self.cgi_radiobutton.get_active(): - return generate.CGI + return sepolicy.generate.CGI if self.user_radiobutton.get_active(): - return generate.USER + return sepolicy.generate.USER if self.init_radiobutton.get_active(): - return generate.DAEMON + return sepolicy.generate.DAEMON if self.dbus_radiobutton.get_active(): - return generate.DBUS + return sepolicy.generate.DBUS if self.inetd_radiobutton.get_active(): - return generate.INETD + return sepolicy.generate.INETD if self.login_user_radiobutton.get_active(): - return generate.LUSER + return sepolicy.generate.LUSER if self.admin_user_radiobutton.get_active(): - return generate.AUSER + return sepolicy.generate.AUSER if self.xwindows_user_radiobutton.get_active(): - return generate.XUSER + return sepolicy.generate.XUSER if self.terminal_user_radiobutton.get_active(): - return generate.TUSER + return sepolicy.generate.TUSER if self.root_user_radiobutton.get_active(): - return generate.RUSER + return sepolicy.generate.RUSER if self.existing_user_radiobutton.get_active(): - return generate.EUSER + return sepolicy.generate.EUSER def generate_policy(self, *args): outputdir = self.output_entry.get_text() try: - my_policy = generate.policy(self.get_name(), self.get_type()) + my_policy = sepolicy.generate.policy(self.get_name(), self.get_type()) iter = self.boolean_store.get_iter_first() while(iter): my_policy.add_boolean(self.boolean_store.get_value(iter, 0), self.boolean_store.get_value(iter, 1)) iter = self.boolean_store.iter_next(iter) - if self.get_type() in generate.APPLICATIONS: + if self.get_type() in sepolicy.generate.APPLICATIONS: my_policy.set_program(self.exec_entry.get_text()) my_policy.gen_symbols()@@ -484,14 +484,14 @@ class childWindow: my_policy.set_use_audit(self.audit_checkbutton.get_active() == 1) my_policy.set_use_terminal(self.terminal_checkbutton.get_active() == 1) my_policy.set_use_mail(self.mail_checkbutton.get_active() == 1) - if self.get_type() is generate.DAEMON: + if self.get_type() is sepolicy.generate.DAEMON: my_policy.set_init_script(self.init_script_entry.get_text()) - if self.get_type() == generate.USER: + if self.get_type() == sepolicy.generate.USER: selected = [] self.user_transition_treeview.get_selection().selected_foreach(foreach, selected) my_policy.set_transition_users(selected) else: - if self.get_type() == generate.RUSER: + if self.get_type() == sepolicy.generate.RUSER: selected = [] self.admin_treeview.get_selection().selected_foreach(foreach, selected) my_policy.set_admin_domains(selected)policycoreutils/semanage/seobject.py +3
-4@@ -31,8 +31,7 @@ import stat from semanage import * PROGNAME = "policycoreutils" import sepolicy -from sepolicy import boolean_desc, boolean_category, gen_bool_dict -gen_bool_dict() +sepolicy.gen_bool_dict() from IPy import IP import gettext@@ -2189,11 +2188,11 @@ class booleanRecords(semanageRecords): def get_desc(self, name): name = selinux.selinux_boolean_sub(name) - return boolean_desc(name) + return sepolicy.boolean_desc(name) def get_category(self, name): name = selinux.selinux_boolean_sub(name) - return boolean_category(name) + return sepolicy.boolean_category(name) def customized(self): l = []
PATCH 9/12 policycoreutils: gettext compat for py2 and 3
In reply to Jason ZamanInstall gettext the same way everywhere and have fallbacks to use str/unicode depending on python version.
--- policycoreutils/gui/booleansPage.py | 22 +++++++++++++--------- policycoreutils/gui/domainsPage.py | 21 +++++++++++++-------- policycoreutils/gui/fcontextPage.py | 22 +++++++++++++--------- policycoreutils/gui/loginsPage.py | 21 +++++++++++++-------- policycoreutils/gui/mappingsPage.py | 21 +++++++++++++-------- policycoreutils/gui/modulesPage.py | 21 +++++++++++++-------- policycoreutils/gui/polgengui.py | 22 +++++++++++++--------- policycoreutils/gui/portsPage.py | 25 +++++++++++++------------ policycoreutils/gui/semanagePage.py | 21 +++++++++++++-------- policycoreutils/gui/statusPage.py | 24 ++++++++++++++++-------- policycoreutils/gui/system-config-selinux.py | 22 +++++++++++++--------- policycoreutils/gui/usersPage.py | 22 +++++++++++++++------- policycoreutils/sandbox/sandbox | 15 ++++++++------- policycoreutils/scripts/chcat | 13 ++++++++++--- policycoreutils/semanage/semanage | 4 ++-- policycoreutils/semanage/seobject.py | 23 ++++++++++++++++------- policycoreutils/sepolicy/sepolicy.py | 21 +++++++++++++-------- policycoreutils/sepolicy/sepolicy/__init__.py | 23 ++++++++++++++--------- policycoreutils/sepolicy/sepolicy/generate.py | 22 +++++++++++++--------- policycoreutils/sepolicy/sepolicy/gui.py | 21 +++++++++++++-------- policycoreutils/sepolicy/sepolicy/interface.py | 22 +++++++++++++--------- 21 files changed, 263 insertions(+), 165 deletions(-)
policycoreutils/gui/booleansPage.py +13 -9
@@ -40,18 +40,22 @@ DISABLED = 2 ## I18N ## PROGNAME = "policycoreutils" - -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode from glob import fnmatch
policycoreutils/gui/domainsPage.py +13 -8
@@ -32,17 +32,22 @@ from semanagePage import * ## I18N ## PROGNAME = "policycoreutils" -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode class domainsPage(semanagePage):
policycoreutils/gui/fcontextPage.py +13 -9
@@ -47,18 +47,22 @@ class context: ## I18N ## PROGNAME = "policycoreutils" - -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode class fcontextPage(semanagePage):
policycoreutils/gui/loginsPage.py +13 -8
@@ -30,17 +30,22 @@ from semanagePage import * ## I18N ## PROGNAME = "policycoreutils" -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode class loginsPage(semanagePage):
policycoreutils/gui/mappingsPage.py +13 -8
@@ -28,17 +28,22 @@ import seobject ## I18N ## PROGNAME = "policycoreutils" -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode class loginsPage:
policycoreutils/gui/modulesPage.py +13 -8
@@ -32,17 +32,22 @@ from subprocess import Popen, PIPE ## I18N ## PROGNAME = "policycoreutils" -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode class modulesPage(semanagePage):
policycoreutils/gui/polgengui.py +13 -9
@@ -58,18 +58,22 @@ def get_all_modules(): ## I18N ## PROGNAME = "policycoreutils" - -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode gnome.program_init("SELinux Policy Generation Tool", "5")
policycoreutils/gui/portsPage.py +13 -12
@@ -30,21 +30,22 @@ from semanagePage import * ## I18N ## PROGNAME = "policycoreutils" -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) -TYPE_COL = 0 -PROTOCOL_COL = 1 -MLS_COL = 2 -PORT_COL = 3 try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode class portsPage(semanagePage):
policycoreutils/gui/semanagePage.py +13 -8
@@ -28,17 +28,22 @@ import seobject ## I18N ## PROGNAME = "policycoreutils" -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode def idle_func():
policycoreutils/gui/statusPage.py +16 -8
@@ -23,6 +23,7 @@ import os import gobject import sys import tempfile +import selinux INSTALLPATH = '/usr/share/system-config-selinux' sys.path.append(INSTALLPATH)
@@ -40,15 +41,22 @@ RELABELFILE = "/.autorelabel" ## I18N ## PROGNAME = "policycoreutils" -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) -import selinux try: - gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1) -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True + gettext.install(PROGNAME, + localedir="/usr/share/locale", + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode class statusPage:
policycoreutils/gui/system-config-selinux.py +13 -9
@@ -47,18 +47,22 @@ import selinux ## I18N ## PROGNAME = "policycoreutils" - -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode gnome.program_init("SELinux Management Tool", "5")
policycoreutils/gui/usersPage.py +15 -7
@@ -30,14 +30,22 @@ from semanagePage import * ## I18N ## PROGNAME = "policycoreutils" -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 + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True + gettext.install(PROGNAME, + localedir="/usr/share/locale", + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode class usersPage(semanagePage):
policycoreutils/sandbox/sandbox +8 -7
@@ -35,18 +35,19 @@ from tempfile import mkdtemp import pwd import sepolicy -PROGNAME = "policycoreutils" SEUNSHARE = "/usr/sbin/seunshare" SANDBOXSH = "/usr/share/sandbox/sandboxX.sh" -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) - +PROGNAME = "policycoreutils" try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - codeset='utf-8') -except IOError: + codeset='utf-8', + **kwargs) +except: try: import builtins builtins.__dict__['_'] = str
policycoreutils/scripts/chcat +10 -3
@@ -30,11 +30,18 @@ import string import getopt import selinux import seobject -import gettext +PROGNAME = "policycoreutils" try: - gettext.install('policycoreutils') -except IOError: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True + gettext.install(PROGNAME, + localedir="/usr/share/locale", + codeset='utf-8', + **kwargs) +except: try: import builtins builtins.__dict__['_'] = str
policycoreutils/semanage/semanage +2 -2
@@ -27,9 +27,9 @@ import traceback import argparse import seobject import sys -import gettext PROGNAME = "policycoreutils" try: + import gettext kwargs = {} if sys.version_info < (3,): kwargs['unicode'] = True
@@ -37,7 +37,7 @@ try: localedir="/usr/share/locale", codeset='utf-8', **kwargs) -except IOError: +except: try: import builtins builtins.__dict__['_'] = str
policycoreutils/semanage/seobject.py +16 -7
@@ -34,13 +34,22 @@ import sepolicy sepolicy.gen_bool_dict() from IPy import IP -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) - -import gettext -translation = gettext.translation(PROGNAME, localedir="/usr/share/locale", fallback=True) -_ = translation.ugettext +try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True + gettext.install(PROGNAME, + localedir="/usr/share/locale", + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode import syslog
policycoreutils/sepolicy/sepolicy.py +13 -8
@@ -27,18 +27,23 @@ import selinux import sepolicy from sepolicy import get_os_version, get_conditionals, get_conditionals_format_text import argparse -import gettext PROGNAME = "policycoreutils" -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode usage = "sepolicy generate [-h] [-n NAME] [-p PATH] [" usage_dict = {' --newtype': ('-t [TYPES [TYPES ...]]',), ' --customize': ('-d DOMAIN', '-a ADMIN_DOMAIN', "[ -w WRITEPATHS ]",), ' --admin_user': ('[-r TRANSITION_ROLE ]', "[ -w WRITEPATHS ]",), ' --application': ('COMMAND', "[ -w WRITEPATHS ]",), ' --cgi': ('COMMAND', "[ -w WRITEPATHS ]",), ' --confined_admin': ('-a ADMIN_DOMAIN', "[ -w WRITEPATHS ]",), ' --dbus': ('COMMAND', "[ -w WRITEPATHS ]",), ' --desktop_user': ('', "[ -w WRITEPATHS ]",), ' --inetd': ('COMMAND', "[ -w WRITEPATHS ]",), ' --init': ('COMMAND', "[ -w WRITEPATHS ]",), ' --sandbox': ("[ -w WRITEPATHS ]",), ' --term_user': ("[ -w WRITEPATHS ]",), ' --x_user': ("[ -w WRITEPATHS ]",)}
policycoreutils/sepolicy/sepolicy/__init__.py +14 -9
@@ -6,8 +6,6 @@ from . import _policy import selinux import glob -PROGNAME = "policycoreutils" -import gettext import sepolgen.defaults as defaults import sepolgen.interfaces as interfaces import sys
@@ -15,16 +13,23 @@ import os import re import gzip -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) +PROGNAME = "policycoreutils" try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode TYPE = _policy.TYPE ROLE = _policy.ROLE
policycoreutils/sepolicy/sepolicy/generate.py +13 -9
@@ -53,18 +53,22 @@ import sepolgen.defaults as defaults ## I18N ## PROGNAME = "policycoreutils" - -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode def get_rpm_nvr_from_header(hdr):
policycoreutils/sepolicy/sepolicy/gui.py +13 -8
@@ -39,20 +39,25 @@ import sepolicy.manpage import dbus import os import re -import gettext import unicodedata PROGNAME = "policycoreutils" -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode reverse_file_type_str = {} for f in sepolicy.file_type_str:
policycoreutils/sepolicy/sepolicy/interface.py +13 -9
@@ -33,18 +33,22 @@ __all__ = ['get_all_interfaces', 'get_interfaces_from_xml', 'get_admin', 'get_us ## I18N ## PROGNAME = "policycoreutils" - -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode def get_interfaces_from_xml(path):
Signature · 1 line
2.7.3
Re: [PATCH 09/12] policycoreutils: gettext compat for py2 and 3
Quoted 2 lines · Jason Zaman
Install gettext the same way everywhere and have fallbacks to use str/unicode depending on python version.
Speaking of gettext. gettext is actually a buildrequire but it is currently not in the list of build requires for selinux
Quoted 765 lines
--- policycoreutils/gui/booleansPage.py | 22 +++++++++++++--------- policycoreutils/gui/domainsPage.py | 21 +++++++++++++-------- policycoreutils/gui/fcontextPage.py | 22 +++++++++++++--------- policycoreutils/gui/loginsPage.py | 21 +++++++++++++-------- policycoreutils/gui/mappingsPage.py | 21 +++++++++++++-------- policycoreutils/gui/modulesPage.py | 21 +++++++++++++-------- policycoreutils/gui/polgengui.py | 22 +++++++++++++--------- policycoreutils/gui/portsPage.py | 25 +++++++++++++------------ policycoreutils/gui/semanagePage.py | 21 +++++++++++++-------- policycoreutils/gui/statusPage.py | 24 ++++++++++++++++-------- policycoreutils/gui/system-config-selinux.py | 22 +++++++++++++--------- policycoreutils/gui/usersPage.py | 22 +++++++++++++++------- policycoreutils/sandbox/sandbox | 15 ++++++++------- policycoreutils/scripts/chcat | 13 ++++++++++--- policycoreutils/semanage/semanage | 4 ++-- policycoreutils/semanage/seobject.py | 23 ++++++++++++++++------- policycoreutils/sepolicy/sepolicy.py | 21 +++++++++++++-------- policycoreutils/sepolicy/sepolicy/__init__.py | 23 ++++++++++++++--------- policycoreutils/sepolicy/sepolicy/generate.py | 22 +++++++++++++--------- policycoreutils/sepolicy/sepolicy/gui.py | 21 +++++++++++++-------- policycoreutils/sepolicy/sepolicy/interface.py | 22 +++++++++++++--------- 21 files changed, 263 insertions(+), 165 deletions(-)policycoreutils/gui/booleansPage.py +13
-9@@ -40,18 +40,22 @@ DISABLED = 2 ## I18N ## PROGNAME = "policycoreutils" - -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode from glob import fnmatchpolicycoreutils/gui/domainsPage.py +13
-8@@ -32,17 +32,22 @@ from semanagePage import * ## I18N ## PROGNAME = "policycoreutils" -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode class domainsPage(semanagePage):policycoreutils/gui/fcontextPage.py +13
-9@@ -47,18 +47,22 @@ class context: ## I18N ## PROGNAME = "policycoreutils" - -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode class fcontextPage(semanagePage):policycoreutils/gui/loginsPage.py +13
-8@@ -30,17 +30,22 @@ from semanagePage import * ## I18N ## PROGNAME = "policycoreutils" -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode class loginsPage(semanagePage):policycoreutils/gui/mappingsPage.py +13
-8@@ -28,17 +28,22 @@ import seobject ## I18N ## PROGNAME = "policycoreutils" -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode class loginsPage:policycoreutils/gui/modulesPage.py +13
-8@@ -32,17 +32,22 @@ from subprocess import Popen, PIPE ## I18N ## PROGNAME = "policycoreutils" -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode class modulesPage(semanagePage):policycoreutils/gui/polgengui.py +13
-9@@ -58,18 +58,22 @@ def get_all_modules(): ## I18N ## PROGNAME = "policycoreutils" - -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode gnome.program_init("SELinux Policy Generation Tool", "5")policycoreutils/gui/portsPage.py +13
-12@@ -30,21 +30,22 @@ from semanagePage import * ## I18N ## PROGNAME = "policycoreutils" -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) -TYPE_COL = 0 -PROTOCOL_COL = 1 -MLS_COL = 2 -PORT_COL = 3 try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode class portsPage(semanagePage):policycoreutils/gui/semanagePage.py +13
-8@@ -28,17 +28,22 @@ import seobject ## I18N ## PROGNAME = "policycoreutils" -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode def idle_func():policycoreutils/gui/statusPage.py +16
-8@@ -23,6 +23,7 @@ import os import gobject import sys import tempfile +import selinux INSTALLPATH = '/usr/share/system-config-selinux' sys.path.append(INSTALLPATH)@@ -40,15 +41,22 @@ RELABELFILE = "/.autorelabel" ## I18N ## PROGNAME = "policycoreutils" -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) -import selinux try: - gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1) -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True + gettext.install(PROGNAME, + localedir="/usr/share/locale", + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode class statusPage:policycoreutils/gui/system-config-selinux.py +13
-9@@ -47,18 +47,22 @@ import selinux ## I18N ## PROGNAME = "policycoreutils" - -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode gnome.program_init("SELinux Management Tool", "5")policycoreutils/gui/usersPage.py +15
-7@@ -30,14 +30,22 @@ from semanagePage import * ## I18N ## PROGNAME = "policycoreutils" -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 + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True + gettext.install(PROGNAME, + localedir="/usr/share/locale", + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode class usersPage(semanagePage):policycoreutils/sandbox/sandbox +8
-7@@ -35,18 +35,19 @@ from tempfile import mkdtemp import pwd import sepolicy -PROGNAME = "policycoreutils" SEUNSHARE = "/usr/sbin/seunshare" SANDBOXSH = "/usr/share/sandbox/sandboxX.sh" -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) - +PROGNAME = "policycoreutils" try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - codeset='utf-8') -except IOError: + codeset='utf-8', + **kwargs) +except: try: import builtins builtins.__dict__['_'] = strpolicycoreutils/scripts/chcat +10
-3@@ -30,11 +30,18 @@ import string import getopt import selinux import seobject -import gettext +PROGNAME = "policycoreutils" try: - gettext.install('policycoreutils') -except IOError: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True + gettext.install(PROGNAME, + localedir="/usr/share/locale", + codeset='utf-8', + **kwargs) +except: try: import builtins builtins.__dict__['_'] = strpolicycoreutils/semanage/semanage +2
-2@@ -27,9 +27,9 @@ import traceback import argparse import seobject import sys -import gettext PROGNAME = "policycoreutils" try: + import gettext kwargs = {} if sys.version_info < (3,): kwargs['unicode'] = True@@ -37,7 +37,7 @@ try: localedir="/usr/share/locale", codeset='utf-8', **kwargs) -except IOError: +except: try: import builtins builtins.__dict__['_'] = strpolicycoreutils/semanage/seobject.py +16
-7@@ -34,13 +34,22 @@ import sepolicy sepolicy.gen_bool_dict() from IPy import IP -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) - -import gettext -translation = gettext.translation(PROGNAME, localedir="/usr/share/locale", fallback=True) -_ = translation.ugettext +try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True + gettext.install(PROGNAME, + localedir="/usr/share/locale", + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode import syslogpolicycoreutils/sepolicy/sepolicy.py +13
-8@@ -27,18 +27,23 @@ import selinux import sepolicy from sepolicy import get_os_version, get_conditionals, get_conditionals_format_text import argparse -import gettext PROGNAME = "policycoreutils" -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode usage = "sepolicy generate [-h] [-n NAME] [-p PATH] [" usage_dict = {' --newtype': ('-t [TYPES [TYPES ...]]',), ' --customize': ('-d DOMAIN', '-a ADMIN_DOMAIN', "[ -w WRITEPATHS ]",), ' --admin_user': ('[-r TRANSITION_ROLE ]', "[ -w WRITEPATHS ]",), ' --application': ('COMMAND', "[ -w WRITEPATHS ]",), ' --cgi': ('COMMAND', "[ -w WRITEPATHS ]",), ' --confined_admin': ('-a ADMIN_DOMAIN', "[ -w WRITEPATHS ]",), ' --dbus': ('COMMAND', "[ -w WRITEPATHS ]",), ' --desktop_user': ('', "[ -w WRITEPATHS ]",), ' --inetd': ('COMMAND', "[ -w WRITEPATHS ]",), ' --init': ('COMMAND', "[ -w WRITEPATHS ]",), ' --sandbox': ("[ -w WRITEPATHS ]",), ' --term_user': ("[ -w WRITEPATHS ]",), ' --x_user': ("[ -w WRITEPATHS ]",)}policycoreutils/sepolicy/sepolicy/__init__.py +14
-9@@ -6,8 +6,6 @@ from . import _policy import selinux import glob -PROGNAME = "policycoreutils" -import gettext import sepolgen.defaults as defaults import sepolgen.interfaces as interfaces import sys@@ -15,16 +13,23 @@ import os import re import gzip -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) +PROGNAME = "policycoreutils" try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode TYPE = _policy.TYPE ROLE = _policy.ROLEpolicycoreutils/sepolicy/sepolicy/generate.py +13
-9@@ -53,18 +53,22 @@ import sepolgen.defaults as defaults ## I18N ## PROGNAME = "policycoreutils" - -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode def get_rpm_nvr_from_header(hdr):policycoreutils/sepolicy/sepolicy/gui.py +13
-8@@ -39,20 +39,25 @@ import sepolicy.manpage import dbus import os import re -import gettext import unicodedata PROGNAME = "policycoreutils" -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode reverse_file_type_str = {} for f in sepolicy.file_type_str:policycoreutils/sepolicy/sepolicy/interface.py +13
-9@@ -33,18 +33,22 @@ __all__ = ['get_all_interfaces', 'get_interfaces_from_xml', 'get_admin', 'get_us ## I18N ## PROGNAME = "policycoreutils" - -import gettext -gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -gettext.textdomain(PROGNAME) try: + import gettext + kwargs = {} + if sys.version_info < (3,): + kwargs['unicode'] = True gettext.install(PROGNAME, localedir="/usr/share/locale", - unicode=False, - codeset='utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode + codeset='utf-8', + **kwargs) +except: + try: + import builtins + builtins.__dict__['_'] = str + except ImportError: + import __builtin__ + __builtin__.__dict__['_'] = unicode def get_interfaces_from_xml(path):
Signature · 3 lines
Key fingerprint = 5F4D 3CDB D3F8 3652 FBD8 02D5 3B6C 5F1D 2C7B 6B02 https://sks-keyservers.net/pks/lookup?op=get&search=0x3B6C5F1D2C7B6B02 Dominick Grift
PATCH 10/12 policycoreutils/gui: update to python3
In reply to Jason Zamanprint functions
exceptions, e => as ekeys.sort() => sorted(d.keys())
--- policycoreutils/gui/booleansPage.py | 2 +- policycoreutils/gui/domainsPage.py | 4 ++-- policycoreutils/gui/fcontextPage.py | 6 ++---- policycoreutils/gui/html_util.py | 2 +- policycoreutils/gui/loginsPage.py | 10 +++------- policycoreutils/gui/mappingsPage.py | 6 ++---- policycoreutils/gui/modulesPage.py | 10 +++++----- policycoreutils/gui/polgengui.py | 12 ++++++------ policycoreutils/gui/portsPage.py | 10 +++------- policycoreutils/gui/semanagePage.py | 4 ++-- policycoreutils/gui/system-config-selinux.py | 8 ++++---- policycoreutils/gui/usersPage.py | 6 ++---- 12 files changed, 33 insertions(+), 47 deletions(-)
policycoreutils/gui/booleansPage.py +1 -1
@@ -188,7 +188,7 @@ class booleansPage: if rc != 0: return self.error(out) self.load(self.filter) - except ValueError, e: + except ValueError as e: self.error(e.args[0]) def filter_changed(self, *arg):
policycoreutils/gui/domainsPage.py +2 -2
@@ -132,7 +132,7 @@ class domainsPage(semanagePage): domain = store.set_value(iter, 1, "") self.itemSelected(selection) - except ValueError, e: + except ValueError as e: self.error(e.args[0]) def propertiesDialog(self):
@@ -157,5 +157,5 @@ class domainsPage(semanagePage): domain = store.set_value(iter, 1, _("Permissive")) self.itemSelected(selection) - except ValueError, e: + except ValueError as e: self.error(e.args[0])
policycoreutils/gui/fcontextPage.py +2 -4
@@ -131,9 +131,7 @@ class fcontextPage(semanagePage): self.fcontext = seobject.fcontextRecords() self.store.clear() fcon_dict = self.fcontext.get_all(self.local) - keys = fcon_dict.keys() - keys.sort() - for k in keys: + for k in sorted(fcon_dict.keys()): if not self.match(fcon_dict, k, filter): continue iter = self.store.append()
@@ -188,7 +186,7 @@ class fcontextPage(semanagePage): return self.error(out) store.remove(iter) self.view.get_selection().select_path((0,)) - except ValueError, e: + except ValueError as e: self.error(e.args[0]) def add(self):
policycoreutils/gui/html_util.py +1 -1
@@ -135,7 +135,7 @@ def html_to_text(html, maxcol=80): text = buffer.getvalue() buffer.close() return text - except Exception, e: + except Exception as e: log_program.error('cannot convert html to text: %s' % e) return None
policycoreutils/gui/loginsPage.py +3 -7
@@ -75,10 +75,8 @@ class loginsPage(semanagePage): self.filter = filter self.login = seobject.loginRecords() dict = self.login.get_all(0) - keys = dict.keys() - keys.sort() self.store.clear() - for k in keys: + for k in sorted(dict.keys()): range = seobject.translate(dict[k][1]) if not (self.match(k, filter) or self.match(dict[k][0], filter) or self.match(range, filter)): continue
@@ -99,9 +97,7 @@ class loginsPage(semanagePage): self.loginsSelinuxUserCombo.add_attribute(cell, 'text', 0) selusers = seobject.seluserRecords().get_all(0) - keys = selusers.keys() - keys.sort() - for k in keys: + for k in sorted(selusers.keys()): if k != "system_u": self.loginsSelinuxUserCombo.append_text(k)
@@ -146,7 +142,7 @@ class loginsPage(semanagePage): return False store.remove(iter) self.view.get_selection().select_path((0,)) - except ValueError, e: + except ValueError as e: self.error(e.args[0]) def add(self):
policycoreutils/gui/mappingsPage.py +2 -4
@@ -56,7 +56,5 @@ class loginsPage: self.view.set_model(self.store) self.login = loginRecords() dict = self.login.get_all(0) - keys = dict.keys() - keys.sort() - for k in keys: - print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1])) + for k in sorted(dict.keys()): + print("%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1])))
policycoreutils/gui/modulesPage.py +5 -5
@@ -113,7 +113,7 @@ class modulesPage(semanagePage): def new_module(self, args): try: Popen(["/usr/share/system-config-selinux/polgengui.py"]) - except ValueError, e: + except ValueError as e: self.error(e.args[0]) def delete(self):
@@ -129,7 +129,7 @@ class modulesPage(semanagePage): store.remove(iter) self.view.get_selection().select_path((0,)) - except ValueError, e: + except ValueError as e: self.error(e.args[0]) def enable_audit(self, button):
@@ -147,7 +147,7 @@ class modulesPage(semanagePage): if status != 0: self.error(output) - except ValueError, e: + except ValueError as e: self.error(e.args[0]) def disable_audit(self, button):
@@ -158,7 +158,7 @@ class modulesPage(semanagePage): if status != 0: self.error(output) - except ValueError, e: + except ValueError as e: self.error(e.args[0]) def propertiesDialog(self):
@@ -193,5 +193,5 @@ class modulesPage(semanagePage): else: self.load() - except ValueError, e: + except ValueError as e: self.error(e.args[0])
policycoreutils/gui/polgengui.py +6 -6
@@ -30,7 +30,7 @@ import gnome import sys try: import sepolicy -except ValueError, e: +except ValueError as e: sys.stderr.write("%s: %s\n" % (e.__class__.__name__, str(e))) sys.exit(1)
@@ -202,7 +202,7 @@ class childWindow: self.all_modules = get_all_modules() self.all_roles = sepolicy.generate.get_all_roles() self.all_users = sepolicy.generate.get_all_users() - except RuntimeError, e: + except RuntimeError as e: self.all_types = [] self.all_modules = [] self.all_roles = []
@@ -340,7 +340,7 @@ class childWindow: for a in sepolicy.interface.get_admin(): iter = self.admin_store.append() self.admin_store.set_value(iter, 0, a) - except ValueError, e: + except ValueError as e: self.error(e.message) def confine_application(self):
@@ -526,7 +526,7 @@ class childWindow: self.info(my_policy.generate(outputdir)) return False - except ValueError, e: + except ValueError as e: self.error(e.message) def delete(self, args):
@@ -694,7 +694,7 @@ class childWindow: try: generate.verify_ports(self.in_tcp_entry.get_text()) generate.verify_ports(self.in_udp_entry.get_text()) - except ValueError, e: + except ValueError as e: self.error(e.message) return True
@@ -702,7 +702,7 @@ class childWindow: try: generate.verify_ports(self.out_tcp_entry.get_text()) generate.verify_ports(self.out_udp_entry.get_text()) - except ValueError, e: + except ValueError as e: self.error(e.message) return True
policycoreutils/gui/portsPage.py +3 -7
@@ -123,10 +123,8 @@ class portsPage(semanagePage): self.filter = filter self.port = seobject.portRecords() dict = self.port.get_all(self.local) - keys = dict.keys() - keys.sort() self.store.clear() - for k in keys: + for k in sorted(dict.keys()): if not (self.match(str(k[0]), filter) or self.match(dict[k][0], filter) or self.match(k[2], filter) or self.match(dict[k][1], filter) or self.match(dict[k][1], filter)): continue iter = self.store.append()
@@ -144,10 +142,8 @@ class portsPage(semanagePage): self.filter = filter self.port = seobject.portRecords() dict = self.port.get_all_by_type(self.local) - keys = dict.keys() - keys.sort() self.store.clear() - for k in keys: + for k in sorted(dict.keys()): ports_string = ", ".join(dict[k]) if not (self.match(ports_string, filter) or self.match(k[0], filter) or self.match(k[1], filter)): continue
@@ -196,7 +192,7 @@ class portsPage(semanagePage): return self.error(out) store.remove(iter) self.view.get_selection().select_path((0,)) - except ValueError, e: + except ValueError as e: self.error(e.args[0]) def add(self):
policycoreutils/gui/semanagePage.py +2 -2
@@ -147,7 +147,7 @@ class semanagePage: if self.add() == False: continue break - except ValueError, e: + except ValueError as e: self.error(e.args[0]) self.dialog.hide()
@@ -160,7 +160,7 @@ class semanagePage: if self.modify() == False: continue break - except ValueError, e: + except ValueError as e: self.error(e.args[0]) self.dialog.hide()
policycoreutils/gui/system-config-selinux.py +4 -4
@@ -25,9 +25,9 @@ import string import sys try: import gtk -except RuntimeError, e: - print "system-config-selinux:", e - print "This is a graphical application and requires DISPLAY to be set." +except RuntimeError as e: + print("system-config-selinux:", e) + print("This is a graphical application and requires DISPLAY to be set.") sys.exit(1) import gtk.glade
@@ -100,7 +100,7 @@ class childWindow: self.add_page(portsPage.portsPage(xml)) self.add_page(modulesPage.modulesPage(xml)) # modules self.add_page(domainsPage.domainsPage(xml)) # domains - except ValueError, e: + except ValueError as e: self.error(e.message) xml.signal_connect("on_quit_activate", self.destroy)
policycoreutils/gui/usersPage.py +2 -4
@@ -79,10 +79,8 @@ class usersPage(semanagePage): self.filter = filter self.user = seobject.seluserRecords() dict = self.user.get_all() - keys = dict.keys() - keys.sort() self.store.clear() - for k in keys: + for k in sorted(dict.keys()): range = seobject.translate(dict[k][2]) if not (self.match(k, filter) or self.match(dict[k][0], filter) or self.match(range, filter) or self.match(dict[k][3], filter)): continue
@@ -155,5 +153,5 @@ class usersPage(semanagePage): return False store.remove(iter) self.view.get_selection().select_path((0,)) - except ValueError, e: + except ValueError as e: self.error(e.args[0])
Signature · 1 line
2.7.3
PATCH 11/12 policycoreutils/gui: py3 support for modules that changed name
In reply to Jason ZamanStringIO moved to io and commands moved to subprocess
--- policycoreutils/gui/booleansPage.py | 12 ++++++++---- policycoreutils/gui/domainsPage.py | 10 +++++++--- policycoreutils/gui/fcontextPage.py | 12 ++++++++---- policycoreutils/gui/html_util.py | 7 +++++-- policycoreutils/gui/loginsPage.py | 12 ++++++++---- policycoreutils/gui/modulesPage.py | 16 ++++++++++------ policycoreutils/gui/polgengui.py | 8 ++++++-- policycoreutils/gui/portsPage.py | 12 ++++++++---- policycoreutils/gui/statusPage.py | 6 +++++- policycoreutils/gui/usersPage.py | 12 ++++++++---- 10 files changed, 73 insertions(+), 34 deletions(-)
policycoreutils/gui/booleansPage.py +8 -4
@@ -31,7 +31,11 @@ import semanagePage INSTALLPATH = '/usr/share/system-config-selinux' sys.path.append(INSTALLPATH) -import commands +try: + from subprocess import getstatusoutput +except ImportError: + from commands import getstatusoutput + ENFORCING = 0 PERMISSIVE = 1 DISABLED = 2
@@ -182,7 +186,7 @@ class booleansPage: return try: self.wait() - (rc, out) = commands.getstatusoutput("semanage boolean -d %s" % boolean) + (rc, out) = getstatusoutput("semanage boolean -d %s" % boolean) self.ready() if rc != 0:
@@ -233,7 +237,7 @@ class booleansPage: self.store.set_value(iter, ACTIVE, not val) self.wait() setsebool = "/usr/sbin/setsebool -P %s %d" % (key, not val) - rc, out = commands.getstatusoutput(setsebool) + rc, out = getstatusoutput(setsebool) if rc != 0: self.error(out) self.load(self.filter)
@@ -242,7 +246,7 @@ class booleansPage: def on_revert_clicked(self, button): self.wait() setsebool = "semanage boolean --deleteall" - commands.getstatusoutput(setsebool) + getstatusoutput(setsebool) self.load(self.filter) self.ready()
policycoreutils/gui/domainsPage.py +7 -3
@@ -20,7 +20,11 @@ import string import gtk import gtk.glade import os -import commands +try: + from subprocess import getstatusoutput +except ImportError: + from commands import getstatusoutput + import gobject import sys import seobject
@@ -124,7 +128,7 @@ class domainsPage(semanagePage): domain = store.get_value(iter, 0) try: self.wait() - status, output = commands.getstatusoutput("semanage permissive -d %s_t" % domain) + status, output = getstatusoutput("semanage permissive -d %s_t" % domain) self.ready() if status != 0: self.error(output)
@@ -149,7 +153,7 @@ class domainsPage(semanagePage): domain = store.get_value(iter, 0) try: self.wait() - status, output = commands.getstatusoutput("semanage permissive -a %s_t" % domain) + status, output = getstatusoutput("semanage permissive -a %s_t" % domain) self.ready() if status != 0: self.error(output)
policycoreutils/gui/fcontextPage.py +8 -4
@@ -21,7 +21,11 @@ import gtk.glade import os import gobject import seobject -import commands +try: + from subprocess import getstatusoutput +except ImportError: + from commands import getstatusoutput + from semanagePage import * SPEC_COL = 0
@@ -179,7 +183,7 @@ class fcontextPage(semanagePage): fspec = store.get_value(iter, SPEC_COL) ftype = store.get_value(iter, FTYPE_COL) self.wait() - (rc, out) = commands.getstatusoutput("semanage fcontext -d -f '%s' '%s'" % (ftype, fspec)) + (rc, out) = getstatusoutput("semanage fcontext -d -f '%s' '%s'" % (ftype, fspec)) self.ready() if rc != 0:
@@ -197,7 +201,7 @@ class fcontextPage(semanagePage): list_model = self.fcontextFileTypeCombo.get_model() active = self.fcontextFileTypeCombo.get_active() self.wait() - (rc, out) = commands.getstatusoutput("semanage fcontext -a -t %s -r %s -f '%s' '%s'" % (type, mls, ftype[active], fspec)) + (rc, out) = getstatusoutput("semanage fcontext -a -t %s -r %s -f '%s' '%s'" % (type, mls, ftype[active], fspec)) self.ready() if rc != 0: self.error(out)
@@ -216,7 +220,7 @@ class fcontextPage(semanagePage): iter = self.fcontextFileTypeCombo.get_active_iter() ftype = list_model.get_value(iter, 0) self.wait() - (rc, out) = commands.getstatusoutput("semanage fcontext -m -t %s -r %s -f '%s' '%s'" % (type, mls, ftype, fspec)) + (rc, out) = getstatusoutput("semanage fcontext -m -t %s -r %s -f '%s' '%s'" % (type, mls, ftype, fspec)) self.ready() if rc != 0: self.error(out)
policycoreutils/gui/html_util.py +5 -2
@@ -30,7 +30,10 @@ import htmllib import formatter as Formatter import string from types import * -import StringIO +try: + from io import StringIO +except ImportError: + from StringIO import StringIO #------------------------------------------------------------------------------
@@ -127,7 +130,7 @@ def unescape_html(s): def html_to_text(html, maxcol=80): try: - buffer = StringIO.StringIO() + buffer = StringIO() formatter = Formatter.AbstractFormatter(TextWriter(buffer, maxcol)) parser = HTMLParserAnchor(formatter) parser.feed(html)
policycoreutils/gui/loginsPage.py +8 -4
@@ -22,7 +22,11 @@ import gtk.glade import os import gobject import sys -import commands +try: + from subprocess import getstatusoutput +except ImportError: + from commands import getstatusoutput + import seobject from semanagePage import *
@@ -135,7 +139,7 @@ class loginsPage(semanagePage): raise ValueError(_("Login '%s' is required") % login) self.wait() - (rc, out) = commands.getstatusoutput("semanage login -d %s" % login) + (rc, out) = getstatusoutput("semanage login -d %s" % login) self.ready() if rc != 0: self.error(out)
@@ -154,7 +158,7 @@ class loginsPage(semanagePage): iter = self.loginsSelinuxUserCombo.get_active_iter() seuser = list_model.get_value(iter, 0) self.wait() - (rc, out) = commands.getstatusoutput("semanage login -a -s %s -r %s %s" % (seuser, serange, target)) + (rc, out) = getstatusoutput("semanage login -a -s %s -r %s %s" % (seuser, serange, target)) self.ready() if rc != 0: self.error(out)
@@ -174,7 +178,7 @@ class loginsPage(semanagePage): iter = self.loginsSelinuxUserCombo.get_active_iter() seuser = list_model.get_value(iter, 0) self.wait() - (rc, out) = commands.getstatusoutput("semanage login -m -s %s -r %s %s" % (seuser, serange, target)) + (rc, out) = getstatusoutput("semanage login -m -s %s -r %s %s" % (seuser, serange, target)) self.ready() if rc != 0: self.error(out)
policycoreutils/gui/modulesPage.py +10 -6
@@ -20,7 +20,11 @@ import string import gtk import gtk.glade import os -import commands +try: + from subprocess import getstatusoutput +except ImportError: + from commands import getstatusoutput + import gobject import sys import seobject
@@ -121,7 +125,7 @@ class modulesPage(semanagePage): module = store.get_value(iter, 0) try: self.wait() - status, output = commands.getstatusoutput("semodule -r %s" % module) + status, output = getstatusoutput("semodule -r %s" % module) self.ready() if status != 0: self.error(output)
@@ -137,10 +141,10 @@ class modulesPage(semanagePage): try: self.wait() if self.audit_enabled: - status, output = commands.getstatusoutput("semodule -DB") + status, output = getstatusoutput("semodule -DB") button.set_label(_("Disable Audit")) else: - status, output = commands.getstatusoutput("semodule -B") + status, output = getstatusoutput("semodule -B") button.set_label(_("Enable Audit")) self.ready()
@@ -153,7 +157,7 @@ class modulesPage(semanagePage): def disable_audit(self, button): try: self.wait() - status, output = commands.getstatusoutput("semodule -B") + status, output = getstatusoutput("semodule -B") self.ready() if status != 0: self.error(output)
@@ -186,7 +190,7 @@ class modulesPage(semanagePage): def add(self, file): try: self.wait() - status, output = commands.getstatusoutput("semodule -i %s" % file) + status, output = getstatusoutput("semodule -i %s" % file) self.ready() if status != 0: self.error(output)
policycoreutils/gui/polgengui.py +6 -2
@@ -35,7 +35,11 @@ except ValueError as e: sys.exit(1) import sepolicy.interface -import commands +try: + from subprocess import getstatusoutput +except ImportError: + from commands import getstatusoutput + import re
@@ -43,7 +47,7 @@ import re def get_all_modules(): try: all_modules = [] - rc, output = commands.getstatusoutput("semodule -l 2>/dev/null") + rc, output = getstatusoutput("semodule -l 2>/dev/null") if rc == 0: l = output.split("\n") for i in l:
policycoreutils/gui/portsPage.py +8 -4
@@ -23,7 +23,11 @@ import os import gobject import sys import seobject -import commands +try: + from subprocess import getstatusoutput +except ImportError: + from commands import getstatusoutput + from semanagePage import * ##
@@ -186,7 +190,7 @@ class portsPage(semanagePage): protocol = store.get_value(iter, 1) try: self.wait() - (rc, out) = commands.getstatusoutput("semanage port -d -p %s %s" % (protocol, port)) + (rc, out) = getstatusoutput("semanage port -d -p %s %s" % (protocol, port)) self.ready() if rc != 0: return self.error(out)
@@ -209,7 +213,7 @@ class portsPage(semanagePage): iter = self.ports_protocol_combo.get_active_iter() protocol = list_model.get_value(iter, 0) self.wait() - (rc, out) = commands.getstatusoutput("semanage port -a -p %s -r %s -t %s %s" % (protocol, mls, target, port_number)) + (rc, out) = getstatusoutput("semanage port -a -p %s -r %s -t %s %s" % (protocol, mls, target, port_number)) self.ready() if rc != 0: self.error(out)
@@ -229,7 +233,7 @@ class portsPage(semanagePage): iter = self.ports_protocol_combo.get_active_iter() protocol = list_model.get_value(iter, 0) self.wait() - (rc, out) = commands.getstatusoutput("semanage port -m -p %s -r %s -t %s %s" % (protocol, mls, target, port_number)) + (rc, out) = getstatusoutput("semanage port -m -p %s -r %s -t %s %s" % (protocol, mls, target, port_number)) self.ready() if rc != 0: self.error(out)
policycoreutils/gui/statusPage.py +5 -1
@@ -28,7 +28,11 @@ import selinux INSTALLPATH = '/usr/share/system-config-selinux' sys.path.append(INSTALLPATH) -import commands +try: + from subprocess import getstatusoutput +except ImportError: + from commands import getstatusoutput + ENFORCING = 1 PERMISSIVE = 0 DISABLED = -1
policycoreutils/gui/usersPage.py +8 -4
@@ -22,7 +22,11 @@ import gtk.glade import os import gobject import sys -import commands +try: + from subprocess import getstatusoutput +except ImportError: + from commands import getstatusoutput + import seobject from semanagePage import *
@@ -114,7 +118,7 @@ class usersPage(semanagePage): roles = self.selinuxRolesEntry.get_text() self.wait() - (rc, out) = commands.getstatusoutput("semanage user -a -R '%s' -r %s %s" % (roles, range, user)) + (rc, out) = getstatusoutput("semanage user -a -R '%s' -r %s %s" % (roles, range, user)) self.ready() if rc != 0: self.error(out)
@@ -130,7 +134,7 @@ class usersPage(semanagePage): roles = self.selinuxRolesEntry.get_text() self.wait() - (rc, out) = commands.getstatusoutput("semanage user -m -R '%s' -r %s %s" % (roles, range, user)) + (rc, out) = getstatusoutput("semanage user -m -R '%s' -r %s %s" % (roles, range, user)) self.ready() if rc != 0:
@@ -146,7 +150,7 @@ class usersPage(semanagePage): raise ValueError(_("SELinux user '%s' is required") % user) self.wait() - (rc, out) = commands.getstatusoutput("semanage user -d %s" % user) + (rc, out) = getstatusoutput("semanage user -d %s" % user) self.ready() if rc != 0: self.error(out)
Signature · 1 line
2.7.3
PATCH 12/12 semanage: Print usage when no args
In reply to Jason Zamanhttps://bugs.python.org/issue16308
Traceback (most recent call last):
File "semanage", line 932, in <module>
do_parser()
File "semanage", line 911, in do_parser
args.func(args)
AttributeError: 'Namespace' object has no attribute 'func'
---
policycoreutils/semanage/semanage | 1 +
1 file changed, 1 insertion(+)policycoreutils/semanage/semanage +1 -0
@@ -856,6 +856,7 @@ def createCommandParser(): #To add a new subcommand define the parser for it in a function above and call it here. subparsers = commandParser.add_subparsers(dest='subcommand') + subparsers.required = True setupImportParser(subparsers) setupExportParser(subparsers) setupLoginParser(subparsers)
Signature · 1 line
2.7.3
Quoted 7 lines · Jason Zaman
Hi all,
This updates almost everything to be compatible with both python2 and 3. It still uses setools3 tho and the C module. I have a work in progress for updating sepolicy to use setools4 but those will come later.
-- Jason
Applied series.
Thanks.
Quoted 7 lines
_______________________________________________
Selinux mailing list
[email protected]
To unsubscribe, send email to [email protected].
To get help, send an email containing "help" to [email protected].
Signature · 2 lines
James Carter <[email protected]> National Security Agency