diff options
author | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-09-21 16:07:07 +0000 |
---|---|---|
committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-09-21 16:07:07 +0000 |
commit | 6907b88a99468f88e6ba2ca479d419dcdf921131 (patch) | |
tree | f5cb8ca5056485096ac54022907299cacc2acc23 /pym/_emerge/unmerge.py | |
parent | 31505dfc2b6a6a0533123fe43d2240aab177d7c4 (diff) | |
download | portage-6907b88a99468f88e6ba2ca479d419dcdf921131.tar.gz portage-6907b88a99468f88e6ba2ca479d419dcdf921131.tar.bz2 portage-6907b88a99468f88e6ba2ca479d419dcdf921131.zip |
Use dict.(keys|values|items)() instead of dict.(iterkeys|itervalues|iteritems)() for compatibility with Python 3.
(2to3-3.1 -f dict -nw ${FILES})
svn path=/main/trunk/; revision=14327
Diffstat (limited to 'pym/_emerge/unmerge.py')
-rw-r--r-- | pym/_emerge/unmerge.py | 6 |
1 files changed, 3 insertions, 3 deletions
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) |