diff options
| author | Jeremy Heiner <scalaprotractor@gmail.com> | 2013-10-12 18:44:33 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-10-14 05:01:15 +0200 |
| commit | 95b0a868f255f2766ae03733882f30c8c7f3b7ca (patch) | |
| tree | 49ee07b8cf5778b47a5037415f322aaa78b2f15d /test/pacman/pmdb.py | |
| parent | 071ba05534f1e5f3eee3435214caa2642e3e2c23 (diff) | |
| download | pacman-95b0a868f255f2766ae03733882f30c8c7f3b7ca.tar.gz pacman-95b0a868f255f2766ae03733882f30c8c7f3b7ca.tar.xz | |
Use dict iteration methods common to both Python 2 and 3.
The .items, .keys, and .values methods in Python 2 make copies, so the
test framework uses the .iter* flavors of those methods. But in Python
3 those .iter* (and even the 2.7 .view*) flavors are removed and the
original methods return views.
Measurements were taken under Python2 to see what impact the copying
had, and there was none. Thus it is not worth the effort to avoid.
Reported as a compatibility issue by 2to3.
Signed-off-by: Jeremy Heiner <ScalaProtractor at gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'test/pacman/pmdb.py')
| -rw-r--r-- | test/pacman/pmdb.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/pacman/pmdb.py b/test/pacman/pmdb.py index b7b3522a..53de91e6 100644 --- a/test/pacman/pmdb.py +++ b/test/pacman/pmdb.py @@ -236,7 +236,7 @@ class pmdb(object): for pkg, entry in pkg_entries: path = os.path.join(self.dbdir, pkg.fullname()) util.mkdir(path) - for name, data in entry.iteritems(): + for name, data in entry.items(): util.mkfile(path, name, data) if self.dbfile: @@ -247,7 +247,7 @@ class pmdb(object): info = tarfile.TarInfo(pkg.fullname()) info.type = tarfile.DIRTYPE tar.addfile(info) - for name, data in entry.iteritems(): + for name, data in entry.items(): filename = os.path.join(pkg.fullname(), name) info = tarfile.TarInfo(filename) info.size = len(data) |