summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Client/Tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools')
-rw-r--r--src/lib/Bcfg2/Client/Tools/APT.py2
-rw-r--r--src/lib/Bcfg2/Client/Tools/Debconf.py2
-rw-r--r--src/lib/Bcfg2/Client/Tools/Encap.py2
-rw-r--r--src/lib/Bcfg2/Client/Tools/POSIX/File.py2
-rw-r--r--src/lib/Bcfg2/Client/Tools/POSIX/__init__.py4
-rw-r--r--src/lib/Bcfg2/Client/Tools/POSIX/base.py12
-rw-r--r--src/lib/Bcfg2/Client/Tools/POSIXUsers.py8
-rw-r--r--src/lib/Bcfg2/Client/Tools/Pkgng.py2
-rw-r--r--src/lib/Bcfg2/Client/Tools/RPM.py4
-rw-r--r--src/lib/Bcfg2/Client/Tools/SELinux.py22
-rw-r--r--src/lib/Bcfg2/Client/Tools/SYSV.py2
-rw-r--r--src/lib/Bcfg2/Client/Tools/YUM.py6
12 files changed, 34 insertions, 34 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/APT.py b/src/lib/Bcfg2/Client/Tools/APT.py
index 77610d9bc..29b4a5575 100644
--- a/src/lib/Bcfg2/Client/Tools/APT.py
+++ b/src/lib/Bcfg2/Client/Tools/APT.py
@@ -245,7 +245,7 @@ class APT(Bcfg2.Client.Tools.Tool):
self.logger.error("Failed to find %s in apt package "
"cache" % pkgname)
continue
- avail_vers = self.pkg_cache[pkgname].versions.keys()
+ avail_vers = list(self.pkg_cache[pkgname].versions.keys())
if pkg.get('version') in avail_vers:
ipkgs.append("%s=%s" % (pkgname, pkg.get('version')))
continue
diff --git a/src/lib/Bcfg2/Client/Tools/Debconf.py b/src/lib/Bcfg2/Client/Tools/Debconf.py
index 784f7e9bc..106e9adbb 100644
--- a/src/lib/Bcfg2/Client/Tools/Debconf.py
+++ b/src/lib/Bcfg2/Client/Tools/Debconf.py
@@ -126,5 +126,5 @@ class Debconf(Bcfg2.Client.Tools.Tool):
extra[name] = Bcfg2.Client.XML.Element(
'Conf', name=name, type='debconf',
current_value=current_value[1:])
- return extra.values()
+ return list(extra.values())
FindExtra.__doc__ = Bcfg2.Client.Tools.Tool.FindExtra.__doc__
diff --git a/src/lib/Bcfg2/Client/Tools/Encap.py b/src/lib/Bcfg2/Client/Tools/Encap.py
index 270f0a5f2..4f286b8ea 100644
--- a/src/lib/Bcfg2/Client/Tools/Encap.py
+++ b/src/lib/Bcfg2/Client/Tools/Encap.py
@@ -23,7 +23,7 @@ class Encap(Bcfg2.Client.Tools.PkgTool):
if match:
self.installed[match.group('name')] = match.group('version')
else:
- print("Failed to split name %s" % pkg)
+ print(("Failed to split name %s" % pkg))
self.logger.debug("Encap: RefreshPackages: self.installed.keys() are:")
self.logger.debug("%s" % list(self.installed.keys()))
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))
diff --git a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
index 004f85682..ff61bbcb1 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
@@ -150,7 +150,7 @@ class POSIXUsers(Bcfg2.Client.Tools.Tool):
for entry in self.getSupportedEntries():
if entry.tag == tag:
specified.append(entry.get("name"))
- for name, data in self.existing[tag].items():
+ for name, data in list(self.existing[tag].items()):
eid = data[self.attr_mapping[tag][self.id_mapping[tag]]]
if name not in specified and self._in_managed_range(tag, eid):
extra.append(Bcfg2.Client.XML.Element(tag, name=name))
@@ -167,7 +167,7 @@ class POSIXUsers(Bcfg2.Client.Tools.Tool):
defaults['home'] = '/root'
else:
defaults['home'] = '/home/%s' % entry.get('name')
- for key, val in defaults.items():
+ for key, val in list(defaults.items()):
if entry.get(key) is None:
entry.set(key, val)
if entry.get('group') in self.existing['POSIXGroup']:
@@ -178,7 +178,7 @@ class POSIXUsers(Bcfg2.Client.Tools.Tool):
def user_supplementary_groups(self, entry):
""" Get a list of supplmentary groups that the user in the
given entry is a member of """
- return [g for g in self.existing['POSIXGroup'].values()
+ return [g for g in list(self.existing['POSIXGroup'].values())
if entry.get("name") in g[3] and
self._in_managed_range('POSIXSupGroup', g[2])]
@@ -221,7 +221,7 @@ class POSIXUsers(Bcfg2.Client.Tools.Tool):
errors.append("%s %s does not exist" % (entry.tag,
entry.get("name")))
else:
- for attr, idx in self.attr_mapping[entry.tag].items():
+ for attr, idx in list(self.attr_mapping[entry.tag].items()):
val = str(self.existing[entry.tag][entry.get("name")][idx])
entry.set("current_%s" % attr, val)
if attr in ["uid", "gid"]:
diff --git a/src/lib/Bcfg2/Client/Tools/Pkgng.py b/src/lib/Bcfg2/Client/Tools/Pkgng.py
index 025bc59be..ffcbfff6e 100644
--- a/src/lib/Bcfg2/Client/Tools/Pkgng.py
+++ b/src/lib/Bcfg2/Client/Tools/Pkgng.py
@@ -64,7 +64,7 @@ class Pkgng(Bcfg2.Client.Tools.Tool):
def FindExtra(self):
"""Find extra packages."""
packages = [entry.get('name') for entry in self.getSupportedEntries()]
- extras = [(name, value) for (name, value) in self.pkg_cache.items()
+ extras = [(name, value) for (name, value) in list(self.pkg_cache.items())
if name not in packages]
return [Bcfg2.Client.XML.Element('Package', name=name, type='pkgng',
current_version=version)
diff --git a/src/lib/Bcfg2/Client/Tools/RPM.py b/src/lib/Bcfg2/Client/Tools/RPM.py
index 6b379918a..001f9bc9a 100644
--- a/src/lib/Bcfg2/Client/Tools/RPM.py
+++ b/src/lib/Bcfg2/Client/Tools/RPM.py
@@ -811,7 +811,7 @@ def rpm_erase(erase_pkgspecs, erase_flags):
idx_list = getindexbykeyword(erase_ts, **pkgspec)
if len(idx_list) > 1 and not 'allmatches' in erase_flags:
#pass
- print('ERROR - Multiple package match for erase', pkgspec)
+ print(('ERROR - Multiple package match for erase', pkgspec))
else:
for idx in idx_list:
erase_ts.addErase(idx)
@@ -891,7 +891,7 @@ def display_verify_file(file_results):
else:
result_string = result_string + '.'
- print(result_string + ' ' + filetype + ' ' + filename)
+ print((result_string + ' ' + filetype + ' ' + filename))
sys.stdout.flush()
#=============================================================================
diff --git a/src/lib/Bcfg2/Client/Tools/SELinux.py b/src/lib/Bcfg2/Client/Tools/SELinux.py
index 7b5ff7813..8a7593660 100644
--- a/src/lib/Bcfg2/Client/Tools/SELinux.py
+++ b/src/lib/Bcfg2/Client/Tools/SELinux.py
@@ -13,7 +13,7 @@ import seobject
import Bcfg2.Client.XML
import Bcfg2.Client.Tools
from Bcfg2.Client.Tools.POSIX.File import POSIXFile
-from Bcfg2.Compat import long # pylint: disable=W0622
+from Bcfg2.Compat import int # pylint: disable=W0622
def pack128(int_val):
@@ -49,7 +49,7 @@ def netmask_itoa(netmask, proto="ipv4"):
if netmask > size:
raise ValueError("Netmask too large: %s" % netmask)
- res = long(0)
+ res = int(0)
for i in range(netmask):
res |= 1 << (size - i - 1)
netmask = socket.inet_ntop(family, pack128(res))
@@ -102,7 +102,7 @@ class SELinux(Bcfg2.Client.Tools.Tool):
def FindExtra(self):
extra = []
- for handler in self.handlers.values():
+ for handler in list(self.handlers.values()):
extra.extend(handler.FindExtra())
return extra
@@ -372,7 +372,7 @@ class SELinuxEntryHandler(object):
except ValueError:
records = self.all_records
return [self.key2entry(key)
- for key in records.keys()
+ for key in list(records.keys())
if key not in specified]
@@ -390,8 +390,8 @@ class SELinuxSebooleanHandler(SELinuxEntryHandler):
# the newer format as far as interoperation with the rest of
# SELinuxEntryHandler goes
rv = SELinuxEntryHandler.all_records.fget(self)
- if rv.values()[0] in [0, 1]:
- for key, val in rv.items():
+ if list(rv.values())[0] in [0, 1]:
+ for key, val in list(rv.items()):
rv[key] = [val, val, val]
return rv
@@ -458,12 +458,12 @@ class SELinuxSeportHandler(SELinuxEntryHandler):
# (type, level) as the value. abstracting around this
# sucks.
ports = self.records.get_all()
- if len(ports.keys()[0]) == 3:
+ if len(list(ports.keys())[0]) == 3:
self._all = ports
else:
# uglist list comprehension ever?
self._all = dict([((k[0], k[1], v[1]), (v[0], v[2]))
- for k, v in ports.items()])
+ for k, v in list(ports.items())])
return self._all
def _key(self, entry):
@@ -522,7 +522,7 @@ class SELinuxSefcontextHandler(SELinuxEntryHandler):
block="block device",
char="character device",
door="door")
- filetypeattrs = dict([v, k] for k, v in filetypenames.iteritems())
+ filetypeattrs = dict([v, k] for k, v in filetypenames.items())
custom_re = re.compile(r'-f \'(?P<filetype>[a-z ]+)\'.*? \'(?P<name>.*)\'')
@property
@@ -754,7 +754,7 @@ class SELinuxSemoduleHandler(SELinuxEntryHandler):
self._all[mod] = (version, 1)
# get other (disabled) modules from the filesystem
- for mod in self._all_records_from_filesystem().keys():
+ for mod in list(self._all_records_from_filesystem().keys()):
if mod not in self._all:
self._all[mod] = ('', 0)
else:
@@ -902,7 +902,7 @@ class SELinuxSemoduleHandler(SELinuxEntryHandler):
specified = [self._key(e)
for e in self.tool.getSupportedEntries()]
rv = []
- for module in self._all_records_from_filesystem().keys():
+ for module in list(self._all_records_from_filesystem().keys()):
if module not in specified:
rv.append(self.key2entry(module))
return rv
diff --git a/src/lib/Bcfg2/Client/Tools/SYSV.py b/src/lib/Bcfg2/Client/Tools/SYSV.py
index 4eea0273f..31fe499a7 100644
--- a/src/lib/Bcfg2/Client/Tools/SYSV.py
+++ b/src/lib/Bcfg2/Client/Tools/SYSV.py
@@ -71,7 +71,7 @@ class SYSV(Bcfg2.Client.Tools.PkgTool):
string
"""
if hasattr(self, 'origpkgtool'):
- if len(packages) == 1 and '_sysv_pkg_path' in packages[0].keys():
+ if len(packages) == 1 and '_sysv_pkg_path' in list(packages[0].keys()):
self.pkgtool = (self.pkgtool[0], ('%s %s',
['_sysv_pkg_path', 'name']))
else:
diff --git a/src/lib/Bcfg2/Client/Tools/YUM.py b/src/lib/Bcfg2/Client/Tools/YUM.py
index ade4da5b3..ad012abfb 100644
--- a/src/lib/Bcfg2/Client/Tools/YUM.py
+++ b/src/lib/Bcfg2/Client/Tools/YUM.py
@@ -499,16 +499,16 @@ class YUM(Bcfg2.Client.Tools.PkgTool):
if self.yumbase.comps.has_group(entry.get('group')):
group = self.yumbase.comps.return_group(entry.get('group'))
group_packages = [p
- for p, d in group.mandatory_packages.items()
+ for p, d in list(group.mandatory_packages.items())
if d]
group_type = entry.get('choose', 'default')
if group_type in ['default', 'optional', 'all']:
group_packages += [
- p for p, d in group.default_packages.items()
+ p for p, d in list(group.default_packages.items())
if d]
if group_type in ['optional', 'all']:
group_packages += [
- p for p, d in group.optional_packages.items()
+ p for p, d in list(group.optional_packages.items())
if d]
if len(group_packages) == 0:
self.logger.error("No packages found for group %s" %
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-21 19:45:36 +0000