From 6907b88a99468f88e6ba2ca479d419dcdf921131 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Mon, 21 Sep 2009 16:07:07 +0000 Subject: 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 --- pym/portage/getbinpkg.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pym/portage/getbinpkg.py') diff --git a/pym/portage/getbinpkg.py b/pym/portage/getbinpkg.py index 5d3864fd1..35bef052a 100644 --- a/pym/portage/getbinpkg.py +++ b/pym/portage/getbinpkg.py @@ -801,7 +801,7 @@ class PackageIndex(object): if not mycpv: continue if self._default_pkg_data: - for k, v in self._default_pkg_data.iteritems(): + for k, v in self._default_pkg_data.items(): d.setdefault(k, v) if self._inherited_keys: for k in self._inherited_keys: @@ -814,7 +814,7 @@ class PackageIndex(object): if self.modified: self.header["TIMESTAMP"] = str(long(time.time())) self.header["PACKAGES"] = str(len(self.packages)) - keys = self.header.keys() + keys = list(self.header.keys()) keys.sort() self._writepkgindex(pkgfile, [(k, self.header[k]) \ for k in keys if self.header[k]]) @@ -827,10 +827,10 @@ class PackageIndex(object): if v is not None and v == metadata.get(k): del metadata[k] if self._default_pkg_data: - for k, v in self._default_pkg_data.iteritems(): + for k, v in self._default_pkg_data.items(): if metadata.get(k) == v: metadata.pop(k, None) - keys = metadata.keys() + keys = list(metadata.keys()) keys.sort() self._writepkgindex(pkgfile, [(k, metadata[k]) for k in keys if metadata[k]]) -- cgit v1.2.3-1-g7c22