diff options
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Packages')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/Pac.py | 2 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/Pkgng.py | 4 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/Source.py | 2 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/Yum.py | 6 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/YumHelper.py | 8 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/__init__.py | 4 |
6 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Pac.py b/src/lib/Bcfg2/Server/Plugins/Packages/Pac.py index e3432c934..9d019b46a 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/Pac.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Pac.py @@ -160,7 +160,7 @@ class PacSource(Source): pkg = parse_db_file(tar.extractfile(tarinfo)) packages[prefix].update(pkg) - for pkg in packages.values(): + for pkg in list(packages.values()): pkgname = pkg['%NAME%'][0] self.pkgnames.add(pkgname) bdeps[barch][pkgname] = [] diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Pkgng.py b/src/lib/Bcfg2/Server/Plugins/Packages/Pkgng.py index 5248ad896..230be2ccd 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/Pkgng.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Pkgng.py @@ -87,10 +87,10 @@ class PkgngSource(Source): self.logger.error("Packages: Failed to read file %s" % fname) raise for line in packagesite.readlines(): - pkg = json.loads(unicode(line, errors='ignore')) + pkg = json.loads(str(line, errors='ignore')) pkgname = pkg['name'] self.pkgnames.add(pkgname) if 'deps' in pkg: - bdeps[barch][pkgname] = pkg['deps'].keys() + bdeps[barch][pkgname] = list(pkg['deps'].keys()) self.process_files(bdeps, dict()) read_files.__doc__ = Source.read_files.__doc__ diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py index 574dbd851..d6529eb20 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py @@ -310,7 +310,7 @@ class Source(Debuggable): # pylint: disable=R0902 opts = xsource.findall("Options") for el in opts: repoopts = dict([(k, v) - for k, v in el.attrib.items() + for k, v in list(el.attrib.items()) if k != "clientonly" and k != "serveronly"]) if el.get("clientonly", "false").lower() == "false": self.server_options.update(repoopts) diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py index acb11f1ab..6732f4179 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py @@ -405,7 +405,7 @@ class YumCollection(Collection): mainopts['debuglevel'] = "2" try: - for opt, val in Bcfg2.Options.setup.yum_options.items(): + for opt, val in list(Bcfg2.Options.setup.yum_options.items()): if opt not in self.option_blacklist: mainopts[opt] = val except ConfigParser.NoSectionError: @@ -486,7 +486,7 @@ class YumCollection(Collection): opts = source.server_options else: opts = source.client_options - for opt, val in opts.items(): + for opt, val in list(opts.items()): config.set(reponame, opt, val) if raw: @@ -805,7 +805,7 @@ class YumCollection(Collection): packages[pkg[0]].append(pkg) except KeyError: packages[pkg[0]] = [pkg] - for name, instances in packages.items(): + for name, instances in list(packages.items()): pkgattrs = dict(type=self.ptype, origin='Packages', name=name) diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/YumHelper.py b/src/lib/Bcfg2/Server/Plugins/Packages/YumHelper.py index 89cc23090..93e8092b4 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/YumHelper.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/YumHelper.py @@ -290,16 +290,16 @@ class HelperSubcommand(Bcfg2.Options.Subcommand): except ValueError: self.logger.error("Error decoding JSON input: %s" % sys.exc_info()[1]) - print(json.dumps(self.fallback)) + print((json.dumps(self.fallback))) return 2 try: - print(json.dumps(self._run(setup, data))) + print((json.dumps(self._run(setup, data)))) except: # pylint: disable=W0702 self.logger.error("Unexpected error running %s: %s" % (self.__class__.__name__.lower(), sys.exc_info()[1]), exc_info=1) - print(json.dumps(self.fallback)) + print((json.dumps(self.fallback))) return 2 return 0 @@ -388,7 +388,7 @@ class CLI(Bcfg2.Options.CommandRegistry): def __init__(self): Bcfg2.Options.CommandRegistry.__init__(self) - self.register_commands(globals().values(), parent=HelperSubcommand) + self.register_commands(list(globals().values()), parent=HelperSubcommand) parser = Bcfg2.Options.get_parser("Bcfg2 yum helper", components=[self]) parser.add_options(self.subcommand_options) diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py index 1a9673891..eb8322ad6 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py @@ -166,7 +166,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin, def set_debug(self, debug): rv = Bcfg2.Server.Plugin.Plugin.set_debug(self, debug) self.sources.set_debug(debug) - for collection in self.collections.values(): + for collection in list(self.collections.values()): collection.set_debug(debug) return rv set_debug.__doc__ = Bcfg2.Server.Plugin.Plugin.set_debug.__doc__ @@ -366,7 +366,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin, gkey = hash(tuple(groups)) if gkey not in gcache: gcache[gkey] = collection.get_groups(groups) - for pkgs in gcache[gkey].values(): + for pkgs in list(gcache[gkey].values()): base.update(pkgs) # essential pkgs are those marked as such by the distribution |