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/portage/elog | |
| parent | Fix case for 0 args in args unicode conversion. (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/portage/elog')
| -rw-r--r-- | pym/portage/elog/__init__.py | 4 | ||||
| -rw-r--r-- | pym/portage/elog/mod_mail_summary.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pym/portage/elog/__init__.py b/pym/portage/elog/__init__.py index c689d821d..53c0a85f7 100644 --- a/pym/portage/elog/__init__.py +++ b/pym/portage/elog/__init__.py @@ -100,7 +100,7 @@ def elog_process(cpv, mysettings, phasefilter=None): else: all_logentries[cpv] = ebuild_logentries - for key in _preserve_logentries.keys(): + for key in list(_preserve_logentries.keys()): if key in all_logentries: all_logentries[key] = _merge_logentries(_preserve_logentries[key], all_logentries[key]) else: @@ -140,7 +140,7 @@ def elog_process(cpv, mysettings, phasefilter=None): listener(mysettings, str(key), default_logentries, default_fulllog) # pass the processing to the individual modules - for s, levels in logsystems.iteritems(): + for s, levels in logsystems.items(): # allow per module overrides of PORTAGE_ELOG_CLASSES if levels: mod_logentries = filter_loglevels(all_logentries[key], levels) diff --git a/pym/portage/elog/mod_mail_summary.py b/pym/portage/elog/mod_mail_summary.py index 4380146d2..3ea0e6fe9 100644 --- a/pym/portage/elog/mod_mail_summary.py +++ b/pym/portage/elog/mod_mail_summary.py @@ -31,7 +31,7 @@ def finalize(mysettings=None): an older version of portage will import the module from a newer version when it upgrades itself.""" global _items - for mysettings, items in _items.itervalues(): + for mysettings, items in _items.values(): _finalize(mysettings, items) _items.clear() @@ -59,7 +59,7 @@ def _finalize(mysettings, items): mybody += "- %s\n" % key mymessage = portage.mail.create_message(myfrom, myrecipient, mysubject, - mybody, attachments=items.values()) + mybody, attachments=list(items.values())) def timeout_handler(signum, frame): raise PortageException("Timeout in finalize() for elog system 'mail_summary'") |