diff options
Diffstat (limited to 'pym/_emerge')
-rw-r--r-- | pym/_emerge/BinpkgFetcher.py | 2 | ||||
-rw-r--r-- | pym/_emerge/BlockerCache.py | 2 | ||||
-rw-r--r-- | pym/_emerge/EbuildMetadataPhase.py | 2 | ||||
-rw-r--r-- | pym/_emerge/JobStatusDisplay.py | 4 | ||||
-rw-r--r-- | pym/_emerge/MetadataRegen.py | 6 | ||||
-rw-r--r-- | pym/_emerge/Package.py | 2 | ||||
-rw-r--r-- | pym/_emerge/PackageVirtualDbapi.py | 4 | ||||
-rw-r--r-- | pym/_emerge/PipeReader.py | 6 | ||||
-rw-r--r-- | pym/_emerge/PollSelectAdapter.py | 2 | ||||
-rw-r--r-- | pym/_emerge/RepoDisplay.py | 6 | ||||
-rw-r--r-- | pym/_emerge/RootConfig.py | 2 | ||||
-rw-r--r-- | pym/_emerge/Scheduler.py | 6 | ||||
-rw-r--r-- | pym/_emerge/SpawnProcess.py | 2 | ||||
-rw-r--r-- | pym/_emerge/SubProcess.py | 2 | ||||
-rw-r--r-- | pym/_emerge/actions.py | 26 | ||||
-rw-r--r-- | pym/_emerge/clear_caches.py | 2 | ||||
-rw-r--r-- | pym/_emerge/depgraph.py | 30 | ||||
-rw-r--r-- | pym/_emerge/main.py | 22 | ||||
-rw-r--r-- | pym/_emerge/unmerge.py | 6 |
19 files changed, 67 insertions, 67 deletions
diff --git a/pym/_emerge/BinpkgFetcher.py b/pym/_emerge/BinpkgFetcher.py index 1f244cb1a..576d00a60 100644 --- a/pym/_emerge/BinpkgFetcher.py +++ b/pym/_emerge/BinpkgFetcher.py @@ -78,7 +78,7 @@ class BinpkgFetcher(SpawnProcess): "FILE" : os.path.basename(pkg_path) } - fetch_env = dict(settings.iteritems()) + fetch_env = dict(settings.items()) fetch_args = [portage.util.varexpand(x, mydict=fcmd_vars) \ for x in portage.util.shlex_split(fcmd)] diff --git a/pym/_emerge/BlockerCache.py b/pym/_emerge/BlockerCache.py index c4270242f..7c6be8ada 100644 --- a/pym/_emerge/BlockerCache.py +++ b/pym/_emerge/BlockerCache.py @@ -71,7 +71,7 @@ class BlockerCache(portage.cache.mappings.MutableMapping): # Validate all the atoms and counters so that # corruption is detected as soon as possible. invalid_items = set() - for k, v in self._cache_data["blockers"].iteritems(): + for k, v in self._cache_data["blockers"].items(): if not isinstance(k, basestring): invalid_items.add(k) continue diff --git a/pym/_emerge/EbuildMetadataPhase.py b/pym/_emerge/EbuildMetadataPhase.py index 1231b1b11..2ff0b64db 100644 --- a/pym/_emerge/EbuildMetadataPhase.py +++ b/pym/_emerge/EbuildMetadataPhase.py @@ -70,7 +70,7 @@ class EbuildMetadataPhase(SubProcess): fd_pipes.setdefault(2, sys.stderr.fileno()) # flush any pending output - for fd in fd_pipes.itervalues(): + for fd in fd_pipes.values(): if fd == sys.stdout.fileno(): sys.stdout.flush() if fd == sys.stderr.fileno(): diff --git a/pym/_emerge/JobStatusDisplay.py b/pym/_emerge/JobStatusDisplay.py index fbda727ee..1c80c5ffa 100644 --- a/pym/_emerge/JobStatusDisplay.py +++ b/pym/_emerge/JobStatusDisplay.py @@ -60,7 +60,7 @@ class JobStatusDisplay(object): object.__setattr__(self, "_isatty", isatty) if not isatty or not self._init_term(): term_codes = {} - for k, capname in self._termcap_name_map.iteritems(): + for k, capname in self._termcap_name_map.items(): term_codes[k] = self._default_term_codes[capname] object.__setattr__(self, "_term_codes", term_codes) encoding = sys.getdefaultencoding() @@ -106,7 +106,7 @@ class JobStatusDisplay(object): return False term_codes = {} - for k, capname in self._termcap_name_map.iteritems(): + for k, capname in self._termcap_name_map.items(): code = tigetstr(capname) if code is None: code = self._default_term_codes[capname] diff --git a/pym/_emerge/MetadataRegen.py b/pym/_emerge/MetadataRegen.py index 4c237d34c..88b157fd0 100644 --- a/pym/_emerge/MetadataRegen.py +++ b/pym/_emerge/MetadataRegen.py @@ -89,7 +89,7 @@ class MetadataRegen(PollScheduler): if self._global_cleanse: for mytree in portdb.porttrees: try: - dead_nodes[mytree] = set(portdb.auxdb[mytree].iterkeys()) + dead_nodes[mytree] = set(portdb.auxdb[mytree].keys()) except CacheError as e: portage.writemsg("Error listing cache entries for " + \ "'%s': %s, continuing...\n" % (mytree, e), @@ -103,7 +103,7 @@ class MetadataRegen(PollScheduler): for mytree in portdb.porttrees: try: dead_nodes[mytree] = set(cpv for cpv in \ - portdb.auxdb[mytree].iterkeys() \ + portdb.auxdb[mytree].keys() \ if cpv_getkey(cpv) in cp_set) except CacheError as e: portage.writemsg("Error listing cache entries for " + \ @@ -119,7 +119,7 @@ class MetadataRegen(PollScheduler): if portdb.findname2(y, mytree=mytree)[0]: dead_nodes[mytree].discard(y) - for mytree, nodes in dead_nodes.iteritems(): + for mytree, nodes in dead_nodes.items(): auxdb = portdb.auxdb[mytree] for y in nodes: try: diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py index 0ea119ef8..15471d1b2 100644 --- a/pym/_emerge/Package.py +++ b/pym/_emerge/Package.py @@ -171,7 +171,7 @@ class _PackageMetadataWrapper(dict): # USE is lazy, but we want it to show up in self.keys(). self['USE'] = '' self.update(metadata) - for k, v in self.iteritems(): + for k, v in self.items(): if k == 'INHERITED': if isinstance(v, basestring): v = frozenset(v.split()) diff --git a/pym/_emerge/PackageVirtualDbapi.py b/pym/_emerge/PackageVirtualDbapi.py index f041e1d8c..adf269116 100644 --- a/pym/_emerge/PackageVirtualDbapi.py +++ b/pym/_emerge/PackageVirtualDbapi.py @@ -32,13 +32,13 @@ class PackageVirtualDbapi(portage.dbapi): obj = PackageVirtualDbapi(self.settings) obj._match_cache = self._match_cache.copy() obj._cp_map = self._cp_map.copy() - for k, v in obj._cp_map.iteritems(): + for k, v in obj._cp_map.items(): obj._cp_map[k] = v[:] obj._cpv_map = self._cpv_map.copy() return obj def __iter__(self): - return self._cpv_map.itervalues() + return iter(self._cpv_map.values()) def __contains__(self, item): existing = self._cpv_map.get(item.cpv) diff --git a/pym/_emerge/PipeReader.py b/pym/_emerge/PipeReader.py index 5b64306e7..369918de3 100644 --- a/pym/_emerge/PipeReader.py +++ b/pym/_emerge/PipeReader.py @@ -24,7 +24,7 @@ class PipeReader(AbstractPollTask): def _start(self): self._reg_ids = set() self._read_data = [] - for k, f in self.input_files.iteritems(): + for k, f in self.input_files.items(): fcntl.fcntl(f.fileno(), fcntl.F_SETFL, fcntl.fcntl(f.fileno(), fcntl.F_GETFL) | os.O_NONBLOCK) self._reg_ids.add(self.scheduler.register(f.fileno(), @@ -65,7 +65,7 @@ class PipeReader(AbstractPollTask): if event & PollConstants.POLLIN: - for f in self.input_files.itervalues(): + for f in self.input_files.values(): if fd == f.fileno(): break @@ -97,7 +97,7 @@ class PipeReader(AbstractPollTask): self._reg_ids = None if self.input_files is not None: - for f in self.input_files.itervalues(): + for f in self.input_files.values(): f.close() self.input_files = None diff --git a/pym/_emerge/PollSelectAdapter.py b/pym/_emerge/PollSelectAdapter.py index 64f17094e..7b7d3d95a 100644 --- a/pym/_emerge/PollSelectAdapter.py +++ b/pym/_emerge/PollSelectAdapter.py @@ -48,7 +48,7 @@ class PollSelectAdapter(PollConstants): select_args = self._select_args if select_args is None: - select_args = [self._registered.keys(), [], []] + select_args = [list(self._registered.keys()), [], []] if timeout is not None: select_args = select_args[:] diff --git a/pym/_emerge/RepoDisplay.py b/pym/_emerge/RepoDisplay.py index e98be93c4..67bf62672 100644 --- a/pym/_emerge/RepoDisplay.py +++ b/pym/_emerge/RepoDisplay.py @@ -10,7 +10,7 @@ class RepoDisplay(object): self._shown_repos = {} self._unknown_repo = False repo_paths = set() - for root_config in roots.itervalues(): + for root_config in roots.values(): portdir = root_config.settings.get("PORTDIR") if portdir: repo_paths.add(portdir) @@ -23,7 +23,7 @@ class RepoDisplay(object): for repo_path in repo_paths ] # pre-allocate index for PORTDIR so that it always has index 0. - for root_config in roots.itervalues(): + for root_config in roots.values(): portdb = root_config.trees["porttree"].dbapi portdir = portdb.porttree_root if portdir: @@ -58,7 +58,7 @@ class RepoDisplay(object): if shown_repos or self._unknown_repo: output.append("Portage tree and overlays:\n") show_repo_paths = list(shown_repos) - for repo_path, repo_index in shown_repos.iteritems(): + for repo_path, repo_index in shown_repos.items(): show_repo_paths[repo_index] = repo_path if show_repo_paths: for index, repo_path in enumerate(show_repo_paths): diff --git a/pym/_emerge/RootConfig.py b/pym/_emerge/RootConfig.py index 48af99120..70e933482 100644 --- a/pym/_emerge/RootConfig.py +++ b/pym/_emerge/RootConfig.py @@ -15,7 +15,7 @@ class RootConfig(object): } tree_pkg_map = {} - for k, v in pkg_tree_map.iteritems(): + for k, v in pkg_tree_map.items(): tree_pkg_map[v] = k def __init__(self, settings, trees, setconfig): diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index 83ffd4b9f..78b9e57d8 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -561,7 +561,7 @@ class Scheduler(PollScheduler): digest = '--digest' in self.myopts if not digest: - for pkgsettings in self.pkgsettings.itervalues(): + for pkgsettings in self.pkgsettings.values(): if 'digest' in pkgsettings.features: digest = True break @@ -604,7 +604,7 @@ class Scheduler(PollScheduler): shown_verifying_msg = False quiet_settings = {} - for myroot, pkgsettings in self.pkgsettings.iteritems(): + for myroot, pkgsettings in self.pkgsettings.items(): quiet_config = portage.config(clone=pkgsettings) quiet_config["PORTAGE_QUIET"] = "1" quiet_config.backup_changes("PORTAGE_QUIET") @@ -759,7 +759,7 @@ class Scheduler(PollScheduler): # any of bad_resume_opts from leaking in # via EMERGE_DEFAULT_OPTS. resume_opts["--ignore-default-opts"] = True - for myopt, myarg in resume_opts.iteritems(): + for myopt, myarg in resume_opts.items(): if myopt not in bad_resume_opts: if myarg is True: mynewargv.append(myopt) diff --git a/pym/_emerge/SpawnProcess.py b/pym/_emerge/SpawnProcess.py index 4a99b50c7..1486e6773 100644 --- a/pym/_emerge/SpawnProcess.py +++ b/pym/_emerge/SpawnProcess.py @@ -43,7 +43,7 @@ class SpawnProcess(SubProcess): fd_pipes.setdefault(2, sys.stderr.fileno()) # flush any pending output - for fd in fd_pipes.itervalues(): + for fd in fd_pipes.values(): if fd == sys.stdout.fileno(): sys.stdout.flush() if fd == sys.stderr.fileno(): diff --git a/pym/_emerge/SubProcess.py b/pym/_emerge/SubProcess.py index 0df94b9e7..5889f556f 100644 --- a/pym/_emerge/SubProcess.py +++ b/pym/_emerge/SubProcess.py @@ -91,7 +91,7 @@ class SubProcess(AbstractPollTask): self._reg_id = None if self._files is not None: - for f in self._files.itervalues(): + for f in self._files.values(): f.close() self._files = None diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 5c351a092..0bdda1fc5 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -744,7 +744,7 @@ def calc_depclean(settings, trees, ldpath_mtimes, continue set_args = {} - for s, package_set in required_sets.iteritems(): + for s, package_set in required_sets.items(): set_atom = SETPREFIX + s set_arg = SetArg(arg=set_atom, set=package_set, root_config=resolver._frozen_config.roots[myroot]) @@ -927,7 +927,7 @@ def calc_depclean(settings, trees, ldpath_mtimes, if not consumers: continue - for lib, lib_consumers in consumers.items(): + for lib, lib_consumers in list(consumers.items()): for consumer_file in list(lib_consumers): if pkg_dblink.isowner(consumer_file, myroot): lib_consumers.remove(consumer_file) @@ -937,7 +937,7 @@ def calc_depclean(settings, trees, ldpath_mtimes, if not consumers: continue - for lib, lib_consumers in consumers.iteritems(): + for lib, lib_consumers in consumers.items(): soname = soname_cache.get(lib) if soname is None: @@ -963,8 +963,8 @@ def calc_depclean(settings, trees, ldpath_mtimes, if consumer_map: search_files = set() - for consumers in consumer_map.itervalues(): - for lib, consumer_providers in consumers.iteritems(): + for consumers in consumer_map.values(): + for lib, consumer_providers in consumers.items(): for lib_consumer, providers in consumer_providers: search_files.add(lib_consumer) search_files.update(providers) @@ -972,8 +972,8 @@ def calc_depclean(settings, trees, ldpath_mtimes, writemsg_level(">>> Assigning files to packages...\n") file_owners = real_vardb._owners.getFileOwnerMap(search_files) - for pkg, consumers in consumer_map.items(): - for lib, consumer_providers in consumers.items(): + for pkg, consumers in list(consumer_map.items()): + for lib, consumer_providers in list(consumers.items()): lib_consumers = set() for lib_consumer, providers in consumer_providers: @@ -1044,7 +1044,7 @@ def calc_depclean(settings, trees, ldpath_mtimes, # and also add any dependencies pulled in by the provider. writemsg_level(">>> Adding lib providers to graph...\n") - for pkg, consumers in consumer_map.iteritems(): + for pkg, consumers in consumer_map.items(): for consumer_dblink in set(chain(*consumers.values())): consumer_pkg = vardb.get(("installed", myroot, consumer_dblink.mycpv, "nomerge")) @@ -1287,7 +1287,7 @@ def action_info(settings, trees, myopts, myfiles): libtool_vers = ",".join(trees["/"]["vartree"].dbapi.match("sys-devel/libtool")) if "--verbose" in myopts: - myvars=settings.keys() + myvars=list(settings.keys()) else: myvars = ['GENTOO_MIRRORS', 'CONFIG_PROTECT', 'CONFIG_PROTECT_MASK', 'PORTDIR', 'DISTDIR', 'PKGDIR', 'PORTAGE_TMPDIR', @@ -1647,7 +1647,7 @@ def action_metadata(settings, portdb, myopts, porttrees=None): for tree_data in porttrees_data: try: - dead_nodes = set(tree_data.dest_db.iterkeys()) + dead_nodes = set(tree_data.dest_db.keys()) except CacheError as e: writemsg_level("Error listing cache entries for " + \ "'%s': %s, continuing...\n" % (tree_data.path, e), @@ -2553,7 +2553,7 @@ def git_sync_timestamps(settings, portdir): continue inconsistent = False - for ec, (ec_path, ec_mtime) in ec_mtimes.iteritems(): + for ec, (ec_path, ec_mtime) in ec_mtimes.items(): updated_mtime = updated_ec_mtimes.get(ec) if updated_mtime is not None and updated_mtime != ec_mtime: writemsg_level("!!! Inconsistent eclass mtime: %s %s\n" % \ @@ -2567,7 +2567,7 @@ def git_sync_timestamps(settings, portdir): if current_eb_mtime != eb_mtime: os.utime(eb_path, (eb_mtime, eb_mtime)) - for ec, (ec_path, ec_mtime) in ec_mtimes.iteritems(): + for ec, (ec_path, ec_mtime) in ec_mtimes.items(): if ec in updated_ec_mtimes: continue ec_path = os.path.join(ec_dir, ec + ".eclass") @@ -2586,7 +2586,7 @@ def load_emerge_config(trees=None): kwargs[k] = v trees = portage.create_trees(trees=trees, **kwargs) - for root, root_trees in trees.iteritems(): + for root, root_trees in trees.items(): settings = root_trees["vartree"].settings setconfig = load_default_config(settings, root_trees) root_trees["root_config"] = RootConfig(settings, root_trees, setconfig) diff --git a/pym/_emerge/clear_caches.py b/pym/_emerge/clear_caches.py index 1fd667f36..83ab77eb4 100644 --- a/pym/_emerge/clear_caches.py +++ b/pym/_emerge/clear_caches.py @@ -6,7 +6,7 @@ import gc import portage def clear_caches(trees): - for d in trees.itervalues(): + for d in trees.values(): d["porttree"].dbapi.melt() d["porttree"].dbapi._aux_cache.clear() d["bintree"].dbapi._aux_cache.clear() diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 44bb7b45f..ed2e88af4 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -163,7 +163,7 @@ class _dynamic_depgraph_config(object): runtime_pkg_mask = {} else: runtime_pkg_mask = dict((k, v.copy()) for (k, v) in \ - runtime_pkg_mask.iteritems()) + runtime_pkg_mask.items()) self._runtime_pkg_mask = runtime_pkg_mask self._need_restart = False @@ -281,7 +281,7 @@ class depgraph(object): # missed update from each SLOT. missed_updates = {} for pkg, mask_reasons in \ - self._dynamic_config._runtime_pkg_mask.iteritems(): + self._dynamic_config._runtime_pkg_mask.items(): if pkg.installed: # Exclude installed here since we only # want to show available updates. @@ -291,7 +291,7 @@ class depgraph(object): other_pkg, mask_type, parent_atoms = missed_updates[k] if other_pkg > pkg: continue - for mask_type, parent_atoms in mask_reasons.iteritems(): + for mask_type, parent_atoms in mask_reasons.items(): if not parent_atoms: continue missed_updates[k] = (pkg, mask_type, parent_atoms) @@ -301,7 +301,7 @@ class depgraph(object): return missed_update_types = {} - for pkg, mask_type, parent_atoms in missed_updates.itervalues(): + for pkg, mask_type, parent_atoms in missed_updates.values(): missed_update_types.setdefault(mask_type, []).append((pkg, parent_atoms)) @@ -395,7 +395,7 @@ class depgraph(object): explanation_columns = 70 explanations = 0 for (slot_atom, root), slot_nodes \ - in self._dynamic_config._slot_collision_info.iteritems(): + in self._dynamic_config._slot_collision_info.items(): msg.append(str(slot_atom)) if root != '/': msg.append(" for %s" % (root,)) @@ -599,7 +599,7 @@ class depgraph(object): packages that have been pulled into a given slot. """ for (slot_atom, root), slot_nodes \ - in self._dynamic_config._slot_collision_info.iteritems(): + in self._dynamic_config._slot_collision_info.items(): all_parent_atoms = set() for pkg in slot_nodes: @@ -1171,7 +1171,7 @@ class depgraph(object): # by dep_zapdeps. We preserve actual parent/child relationships # here in order to avoid distorting the dependency graph like # <=portage-2.1.6.x did. - for virt_pkg, atoms in selected_atoms.iteritems(): + for virt_pkg, atoms in selected_atoms.items(): # Just assume depth + 1 here for now, though it's not entirely # accurate since multilple levels of indirect virtual deps may @@ -1744,7 +1744,7 @@ class depgraph(object): args_set.add(atom) self._dynamic_config._set_atoms.clear() - self._dynamic_config._set_atoms.update(chain(*self._dynamic_config._sets.itervalues())) + self._dynamic_config._set_atoms.update(chain(*self._dynamic_config._sets.values())) atom_arg_map = self._dynamic_config._atom_arg_map atom_arg_map.clear() for arg in args: @@ -1760,7 +1760,7 @@ class depgraph(object): # Invalidate the package selection cache, since # arguments influence package selections. self._dynamic_config._highest_pkg_cache.clear() - for trees in self._dynamic_config._filtered_trees.itervalues(): + for trees in self._dynamic_config._filtered_trees.values(): trees["porttree"].dbapi._clear_cache() def _greedy_slots(self, root_config, atom, blocker_lookahead=False): @@ -1809,7 +1809,7 @@ class depgraph(object): except portage.exception.InvalidDependString: continue blocker_atoms = [] - for atoms in selected_atoms.itervalues(): + for atoms in selected_atoms.values(): blocker_atoms.extend(x for x in atoms if x.blocker) blockers[pkg] = InternalPackageSet(initial_atoms=blocker_atoms) @@ -3062,7 +3062,7 @@ class depgraph(object): (running_root, running_portage.cpv, e), noiselevel=-1) del e portage_rdepend = {running_portage : []} - for atoms in portage_rdepend.itervalues(): + for atoms in portage_rdepend.values(): runtime_deps.update(atom for atom in atoms \ if not atom.blocker) @@ -3648,7 +3648,7 @@ class depgraph(object): # Reduce noise by pruning packages that are only # pulled in by other conflict packages. pruned_pkgs = set() - for pkg, parent_atoms in conflict_pkgs.iteritems(): + for pkg, parent_atoms in conflict_pkgs.items(): relevant_parent = False for parent, atom in parent_atoms: if parent not in conflict_pkgs: @@ -3665,7 +3665,7 @@ class depgraph(object): indent = " " # Max number of parents shown, to avoid flooding the display. max_parents = 3 - for pkg, parent_atoms in conflict_pkgs.iteritems(): + for pkg, parent_atoms in conflict_pkgs.items(): pruned_list = set() @@ -4538,7 +4538,7 @@ class depgraph(object): "merged because it is listed in\n") msg.append("package.provided:\n\n") problems_sets = set() - for (arg, atom), refs in arg_refs.iteritems(): + for (arg, atom), refs in arg_refs.items(): ref_string = "" if refs: problems_sets.update(refs) @@ -5243,7 +5243,7 @@ def get_masking_status(pkg, pkgsettings, root_config): mreasons.append("CHOST: %s" % \ pkg.metadata["CHOST"]) if pkg.invalid: - for msg_type, msgs in pkg.invalid.iteritems(): + for msg_type, msgs in pkg.invalid.items(): for msg in msgs: mreasons.append("invalid: %s" % (msg,)) diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 6ac1b50eb..09522375f 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -255,7 +255,7 @@ def display_preserved_libs(vardbapi, myopts): samefile_map[obj_key] = alt_paths alt_paths.add(f) - for alt_paths in samefile_map.itervalues(): + for alt_paths in samefile_map.values(): alt_paths = sorted(alt_paths) for p in alt_paths: print(colorize("WARN", " * ") + " - %s" % (p,)) @@ -422,13 +422,13 @@ def insert_optional_args(args): continue match = None - for k, arg_choices in short_arg_opts.iteritems(): + for k, arg_choices in short_arg_opts.items(): if k in arg: match = k break if match is None: - for k, arg_choices in short_arg_opts_n.iteritems(): + for k, arg_choices in short_arg_opts_n.items(): if k in arg: match = k break @@ -631,14 +631,14 @@ def parse_opts(tmpcmdline, silent=False): for myopt in options: parser.add_option(myopt, action="store_true", dest=myopt.lstrip("--").replace("-", "_"), default=False) - for shortopt, longopt in shortmapping.iteritems(): + for shortopt, longopt in shortmapping.items(): parser.add_option("-" + shortopt, action="store_true", dest=longopt.lstrip("--").replace("-", "_"), default=False) - for myalias, myopt in longopt_aliases.iteritems(): + for myalias, myopt in longopt_aliases.items(): parser.add_option(myalias, action="store_true", dest=myopt.lstrip("--").replace("-", "_"), default=False) - for myopt, kwargs in argument_options.iteritems(): + for myopt, kwargs in argument_options.items(): shortopt = kwargs.pop("shortopt", None) args = [myopt] if shortopt is not None: @@ -941,7 +941,7 @@ def expand_set_arguments(myfiles, myaction, root_config): def repo_name_check(trees): missing_repo_names = set() - for root, root_trees in trees.iteritems(): + for root, root_trees in trees.items(): if "porttree" in root_trees: portdb = root_trees["porttree"].dbapi missing_repo_names.update(portdb.porttrees) @@ -973,7 +973,7 @@ def repo_name_check(trees): def repo_name_duplicate_check(trees): ignored_repos = {} - for root, root_trees in trees.iteritems(): + for root, root_trees in trees.items(): if 'porttree' in root_trees: portdb = root_trees['porttree'].dbapi if portdb.mysettings.get('PORTAGE_REPO_DUPLICATE_WARN') != '0': @@ -1003,7 +1003,7 @@ def repo_name_duplicate_check(trees): return bool(ignored_repos) def config_protect_check(trees): - for root, root_trees in trees.iteritems(): + for root, root_trees in trees.items(): if not root_trees["root_config"].settings.get("CONFIG_PROTECT"): msg = "!!! CONFIG_PROTECT is empty" if root != "/": @@ -1013,7 +1013,7 @@ def config_protect_check(trees): def profile_check(trees, myaction): if myaction in ("help", "info", "sync", "version"): return os.EX_OK - for root, root_trees in trees.iteritems(): + for root, root_trees in trees.items(): if root_trees["root_config"].settings.profiles: continue # generate some profile related warning messages @@ -1095,7 +1095,7 @@ def emerge_main(): repo_name_duplicate_check(trees) config_protect_check(trees) - for mytrees in trees.itervalues(): + for mytrees in trees.values(): mydb = mytrees["porttree"].dbapi # Freeze the portdbapi for performance (memoize all xmatch results). mydb.freeze() diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py index 710a57b28..ddcfa8180 100644 --- a/pym/_emerge/unmerge.py +++ b/pym/_emerge/unmerge.py @@ -243,7 +243,7 @@ def unmerge(root_config, myopts, unmerge_action, slotmap[myslot][vartree.dbapi.cpv_counter(mypkg)] = mypkg for myslot in slotmap: - counterkeys = slotmap[myslot].keys() + counterkeys = list(slotmap[myslot].keys()) if not counterkeys: continue counterkeys.sort() @@ -411,7 +411,7 @@ def unmerge(root_config, myopts, unmerge_action, unordered[cp] = cp_dict for k in d: cp_dict[k] = set() - for k, v in d.iteritems(): + for k, v in d.items(): cp_dict[k].update(v) pkgmap = [unordered[cp] for cp in sorted(unordered)] @@ -419,7 +419,7 @@ def unmerge(root_config, myopts, unmerge_action, selected = pkgmap[x]["selected"] if not selected: continue - for mytype, mylist in pkgmap[x].iteritems(): + for mytype, mylist in pkgmap[x].items(): if mytype == "selected": continue mylist.difference_update(all_selected) |