[python-debian/master 05/36] Rely on default mapping iteration rather than using keys().

[Colin Watson]

---
 examples/debtags/pkgwalk |    2 +-
 lib/debian/deb822.py     |    4 ++--
 tests/test_deb822.py     |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/debtags/pkgwalk b/examples/debtags/pkgwalk
index ed02aa4..d6ec2bb 100755
--- a/examples/debtags/pkgwalk
+++ b/examples/debtags/pkgwalk
@@ -73,7 +73,7 @@ if __name__ == '__main__':
 		# Divide every tag score by the number of packages in the trail,
 		# obtaining a 'tag weight'.  A package can be later scored by summing
 		# the weight of all its tags.
-		for tag in tagscores.iterkeys():
+		for tag in tagscores:
 			tagscores[tag] = float(tagscores[tag]) / float(len(trail))
 
 		# Find the merged tagset of the packages in trail
diff --git a/lib/debian/deb822.py b/lib/debian/deb822.py
index b3be552..742527c 100644
--- a/lib/debian/deb822.py
+++ b/lib/debian/deb822.py
@@ -169,7 +169,7 @@ class Deb822Dict(object, UserDict.DictMixin):
         if _parsed is not None:
             self.__parsed = _parsed
             if _fields is None:
-                self.__keys.extend([ _strI(k) for k in self.__parsed.keys() ])
+                self.__keys.extend([ _strI(k) for k in self.__parsed ])
             else:
                 self.__keys.extend([ _strI(f) for f in _fields if f in self.__parsed ])
         
@@ -440,7 +440,7 @@ class Deb822(Deb822Dict):
             # was explicitly specified
             encoding = self.encoding
 
-        for key in self.iterkeys():
+        for key in self:
             value = self.get_as_string(key)
             if not value or value[0] == '\n':
                 # Avoid trailing whitespace after "Field:" if it's on its own
diff --git a/tests/test_deb822.py b/tests/test_deb822.py
index 82c3540..c99e985 100755
--- a/tests/test_deb822.py
+++ b/tests/test_deb822.py
@@ -566,7 +566,7 @@ class TestDeb822(unittest.TestCase):
 
         deb822_ = deb822.Deb822(StringIO(UNPARSED_PACKAGE))
         # deb822_.keys() will return non-normalized keys
-        for k in deb822_.keys():
+        for k in deb822_:
             self.assertEqual(deb822_[k], deb822_[k.lower()])
 
     def test_multiline_trailing_whitespace_after_colon(self):
-- 
1.7.2.5