Re: [PATCH] policycoreutils: replace string.join() with str.join()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 11/25/2015 07:21 AM, Petr Lautrbach wrote:
Fixes Python 3 error:
   AttributeError: module 'string' has no attribute 'join'

Based on a patch by Tomas Radej <tradej@xxxxxxxxxx>
Signed-off-by: Petr Lautrbach <plautrba@xxxxxxxxxx>

Thanks, applied.

---
  policycoreutils/semanage/seobject.py | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/policycoreutils/semanage/seobject.py b/policycoreutils/semanage/seobject.py
index d29dba5..c52be75 100644
--- a/policycoreutils/semanage/seobject.py
+++ b/policycoreutils/semanage/seobject.py
@@ -846,7 +846,7 @@ class seluserRecords(semanageRecords):
      def __modify(self, name, roles=[], selevel="", serange="", prefix=""):
          oldserole = ""
          oldserange = ""
-        newroles = string.join(roles, ' ')
+        newroles = " ".join(roles)
          if prefix == "" and len(roles) == 0 and serange == "" and selevel == "":
              if is_mls_enabled == 1:
                  raise ValueError(_("Requires prefix, roles, level or range"))
@@ -870,7 +870,7 @@ class seluserRecords(semanageRecords):
          oldserange = semanage_user_get_mlsrange(u)
          (rc, rlist) = semanage_user_get_roles(self.sh, u)
          if rc >= 0:
-            oldserole = string.join(rlist, ' ')
+            oldserole = " ".join(rlist)

          if (is_mls_enabled == 1) and (serange != ""):
              semanage_user_set_mlsrange(self.sh, u, untranslate(serange))
@@ -980,7 +980,7 @@ class seluserRecords(semanageRecords):
              if rc < 0:
                  raise ValueError(_("Could not list roles for user %s") % name)

-            roles = string.join(rlist, ' ')
+            roles = " ".join(rlist)
              ddict[semanage_user_get_name(u)] = (semanage_user_get_prefix(u), semanage_user_get_mlslevel(u), semanage_user_get_mlsrange(u), roles)

          return ddict


_______________________________________________
Selinux mailing list
Selinux@xxxxxxxxxxxxx
To unsubscribe, send email to Selinux-leave@xxxxxxxxxxxxx.
To get help, send an email containing "help" to Selinux-request@xxxxxxxxxxxxx.



[Index of Archives]     [Selinux Refpolicy]     [Linux SGX]     [Fedora Users]     [Fedora Desktop]     [Yosemite Photos]     [Yosemite Camping]     [Yosemite Campsites]     [KDE Users]     [Gnome Users]

  Powered by Linux