diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-09-22 20:18:45 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-09-22 20:18:45 +0000 |
| commit | f6c5620a3e093567f6b5eff414a012607a39ca5c (patch) | |
| tree | 1f039ea853c69156dddbc5911231836f3f987e3f /pym/_emerge | |
| parent | 38e5d658da8cd06b72e4e802f9e831a2143307d1 (diff) | |
| download | portage-f6c5620a3e093567f6b5eff414a012607a39ca5c.tar.gz portage-f6c5620a3e093567f6b5eff414a012607a39ca5c.tar.bz2 portage-f6c5620a3e093567f6b5eff414a012607a39ca5c.zip | |
Replace dict.keys() usage with __iter__(), since it behaves identically in
both python 2.x and 3.x.
svn path=/main/trunk/; revision=14380
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/MetadataRegen.py | 4 | ||||
| -rw-r--r-- | pym/_emerge/PollSelectAdapter.py | 2 | ||||
| -rw-r--r-- | pym/_emerge/actions.py | 4 | ||||
| -rw-r--r-- | pym/_emerge/unmerge.py | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/pym/_emerge/MetadataRegen.py b/pym/_emerge/MetadataRegen.py index 6bfd722c2..287312e17 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].keys()) + dead_nodes[mytree] = set(portdb.auxdb[mytree]) 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].keys() \ + portdb.auxdb[mytree] \ if cpv_getkey(cpv) in cp_set) except CacheError as e: portage.writemsg("Error listing cache entries for " + \ diff --git a/pym/_emerge/PollSelectAdapter.py b/pym/_emerge/PollSelectAdapter.py index 7b7d3d95a..b136e7eb0 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 = [list(self._registered.keys()), [], []] + select_args = [list(self._registered), [], []] if timeout is not None: select_args = select_args[:] diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 4cae98f29..b33fb5079 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -1290,7 +1290,7 @@ def action_info(settings, trees, myopts, myfiles): libtool_vers = ",".join(trees["/"]["vartree"].dbapi.match("sys-devel/libtool")) if "--verbose" in myopts: - myvars=list(settings.keys()) + myvars = list(settings) else: myvars = ['GENTOO_MIRRORS', 'CONFIG_PROTECT', 'CONFIG_PROTECT_MASK', 'PORTDIR', 'DISTDIR', 'PKGDIR', 'PORTAGE_TMPDIR', @@ -1650,7 +1650,7 @@ def action_metadata(settings, portdb, myopts, porttrees=None): for tree_data in porttrees_data: try: - dead_nodes = set(tree_data.dest_db.keys()) + dead_nodes = set(tree_data.dest_db) except CacheError as e: writemsg_level("Error listing cache entries for " + \ "'%s': %s, continuing...\n" % (tree_data.path, e), diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py index b97207d68..4d2a546c5 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 = list(slotmap[myslot].keys()) + counterkeys = list(slotmap[myslot]) if not counterkeys: continue counterkeys.sort() |