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/tests/env | |
| 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/tests/env')
| -rw-r--r-- | pym/portage/tests/env/config/test_PackageKeywordsFile.py | 2 | ||||
| -rw-r--r-- | pym/portage/tests/env/config/test_PackageUseFile.py | 2 | ||||
| -rw-r--r-- | pym/portage/tests/env/config/test_PortageModulesFile.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pym/portage/tests/env/config/test_PackageKeywordsFile.py b/pym/portage/tests/env/config/test_PackageKeywordsFile.py index 228cf2ecb..d01633125 100644 --- a/pym/portage/tests/env/config/test_PackageKeywordsFile.py +++ b/pym/portage/tests/env/config/test_PackageKeywordsFile.py @@ -23,7 +23,7 @@ class PackageKeywordsFileTestCase(TestCase): f = PackageKeywordsFile(self.fname) f.load() i = 0 - for cpv, keyword in f.iteritems(): + for cpv, keyword in f.items(): self.assertEqual( cpv, self.cpv[i] ) [k for k in keyword if self.assertTrue(k in self.keywords)] i = i + 1 diff --git a/pym/portage/tests/env/config/test_PackageUseFile.py b/pym/portage/tests/env/config/test_PackageUseFile.py index 575ede505..4157d6097 100644 --- a/pym/portage/tests/env/config/test_PackageUseFile.py +++ b/pym/portage/tests/env/config/test_PackageUseFile.py @@ -22,7 +22,7 @@ class PackageUseFileTestCase(TestCase): try: f = PackageUseFile(self.fname) f.load() - for cpv, use in f.iteritems(): + for cpv, use in f.items(): self.assertEqual( cpv, self.cpv ) [flag for flag in use if self.assertTrue(flag in self.useflags)] finally: diff --git a/pym/portage/tests/env/config/test_PortageModulesFile.py b/pym/portage/tests/env/config/test_PortageModulesFile.py index 41a44c4cc..8a37b73bd 100644 --- a/pym/portage/tests/env/config/test_PortageModulesFile.py +++ b/pym/portage/tests/env/config/test_PortageModulesFile.py @@ -32,7 +32,7 @@ class PortageModulesFileTestCase(TestCase): def BuildFile(self): fd, self.fname = mkstemp() f = os.fdopen(fd, 'w') - for k, v in self.items.iteritems(): + for k, v in self.items.items(): f.write('%s=%s\n' % (k,v)) f.close() |