aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-09-21 16:07:07 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-09-21 16:07:07 +0000
commit6907b88a99468f88e6ba2ca479d419dcdf921131 (patch)
treef5cb8ca5056485096ac54022907299cacc2acc23 /pym/portage/manifest.py
parentFix case for 0 args in args unicode conversion. (diff)
downloadportage-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/manifest.py')
-rw-r--r--pym/portage/manifest.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/pym/portage/manifest.py b/pym/portage/manifest.py
index cd2609c3b..7b20a3c2d 100644
--- a/pym/portage/manifest.py
+++ b/pym/portage/manifest.py
@@ -68,13 +68,13 @@ def parseManifest2(mysplit):
class ManifestEntry(object):
__slots__ = ("type", "name", "hashes")
def __init__(self, **kwargs):
- for k, v in kwargs.iteritems():
+ for k, v in kwargs.items():
setattr(self, k, v)
class Manifest2Entry(ManifestEntry):
def __str__(self):
myline = " ".join([self.type, self.name, str(self.hashes["size"])])
- myhashkeys = self.hashes.keys()
+ myhashkeys = list(self.hashes.keys())
myhashkeys.remove("size")
myhashkeys.sort()
for h in myhashkeys:
@@ -202,15 +202,15 @@ class Manifest(object):
return myhashdict
def _createManifestEntries(self):
- mytypes = self.fhashdict.keys()
+ mytypes = list(self.fhashdict.keys())
mytypes.sort()
for t in mytypes:
- myfiles = self.fhashdict[t].keys()
+ myfiles = list(self.fhashdict[t].keys())
myfiles.sort()
for f in myfiles:
myentry = Manifest2Entry(
type=t, name=f, hashes=self.fhashdict[t][f].copy())
- myhashkeys = myentry.hashes.keys()
+ myhashkeys = list(myentry.hashes.keys())
myhashkeys.sort()
for h in myhashkeys:
if h not in ["size"] + portage.const.MANIFEST2_HASH_FUNCTIONS: