diff options
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/POSIX')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/POSIX/File.py | 2 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/POSIX/__init__.py | 4 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/POSIX/base.py | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/File.py b/src/lib/Bcfg2/Client/Tools/POSIX/File.py index c68c57995..75856782f 100644 --- a/src/lib/Bcfg2/Client/Tools/POSIX/File.py +++ b/src/lib/Bcfg2/Client/Tools/POSIX/File.py @@ -188,7 +188,7 @@ class POSIXFile(POSIXTool): if interactive: entry.set("qtext", "\n".join(prompt)) if not sensitive: - for attr, val in attrs.items(): + for attr, val in list(attrs.items()): entry.set(attr, val) def _diff(self, content1, content2, filename=None): diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/__init__.py b/src/lib/Bcfg2/Client/Tools/POSIX/__init__.py index 41bff751d..ce7976a98 100644 --- a/src/lib/Bcfg2/Client/Tools/POSIX/__init__.py +++ b/src/lib/Bcfg2/Client/Tools/POSIX/__init__.py @@ -31,9 +31,9 @@ class POSIX(Bcfg2.Client.Tools.Tool): Bcfg2.Client.Tools.Tool.__init__(self, config) self._handlers = self._load_handlers() self.logger.debug("POSIX: Handlers loaded: %s" % - (", ".join(self._handlers.keys()))) + (", ".join(list(self._handlers.keys())))) self.__req__ = dict(Path=dict()) - for etype, hdlr in self._handlers.items(): + for etype, hdlr in list(self._handlers.items()): self.__req__['Path'][etype] = hdlr.__req__ self.__handles__.append(('Path', etype)) # Tool.__init__() sets up the list of handled entries, but we diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/base.py b/src/lib/Bcfg2/Client/Tools/POSIX/base.py index ffa527cd6..487811d38 100644 --- a/src/lib/Bcfg2/Client/Tools/POSIX/base.py +++ b/src/lib/Bcfg2/Client/Tools/POSIX/base.py @@ -250,7 +250,7 @@ class POSIXTool(Bcfg2.Client.Tools.Tool): entry.get("name")) return True - for aclkey, perms in acls.items(): + for aclkey, perms in list(acls.items()): atype, scope, qualifier = aclkey if atype == "default": if defacl is None: @@ -260,7 +260,7 @@ class POSIXTool(Bcfg2.Client.Tools.Tool): aclentry = posix1e.Entry(defacl) else: aclentry = posix1e.Entry(acl) - for perm in ACL_MAP.values(): + for perm in list(ACL_MAP.values()): if perm & perms: aclentry.permset.add(perm) aclentry.tag_type = scope @@ -374,7 +374,7 @@ class POSIXTool(Bcfg2.Client.Tools.Tool): return 0 elif hasattr(perms, 'test'): # Permset object - return sum([p for p in ACL_MAP.values() + return sum([p for p in list(ACL_MAP.values()) if perms.test(p)]) try: @@ -576,7 +576,7 @@ class POSIXTool(Bcfg2.Client.Tools.Tool): self.logger.debug("POSIX: " + error) entry.set('qtext', "\n".join([entry.get('qtext', '')] + errors)) if path == entry.get("name"): - for attr, val in attrib.items(): + for attr, val in list(attrib.items()): if val is not None: entry.set(attr, str(val)) @@ -710,10 +710,10 @@ class POSIXTool(Bcfg2.Client.Tools.Tool): missing = [] extra = [] wrong = [] - for aclkey, perms in wanted.items(): + for aclkey, perms in list(wanted.items()): _verify_acl(aclkey, perms) - for aclkey, perms in existing.items(): + for aclkey, perms in list(existing.items()): if aclkey not in wanted: extra.append(self._acl2string(aclkey, perms)) |