diff options
Diffstat (limited to 'debian/lib/python')
| -rw-r--r-- | debian/lib/python/debian_linux/debian.py | 12 | ||||
| -rw-r--r-- | debian/lib/python/debian_linux/gencontrol.py | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/debian/lib/python/debian_linux/debian.py b/debian/lib/python/debian_linux/debian.py index 00db2c316d08..e0780ba7eae6 100644 --- a/debian/lib/python/debian_linux/debian.py +++ b/debian/lib/python/debian_linux/debian.py @@ -418,8 +418,8 @@ class Package(dict): pass super(Package, self).__setitem__(key, value) - def iterkeys(self): - keys = set(self.keys()) + def keys(self): + keys = set(super(Package, self).keys()) for i in self._fields.keys(): if i in self: keys.remove(i) @@ -427,10 +427,10 @@ class Package(dict): for i in keys: yield i - def iteritems(self): - for i in self.iterkeys(): + def items(self): + for i in self.keys(): yield (i, self[i]) - def itervalues(self): - for i in self.iterkeys(): + def values(self): + for i in self.keys(): yield self[i] diff --git a/debian/lib/python/debian_linux/gencontrol.py b/debian/lib/python/debian_linux/gencontrol.py index ec139ff1abfc..fdc7e991891d 100644 --- a/debian/lib/python/debian_linux/gencontrol.py +++ b/debian/lib/python/debian_linux/gencontrol.py @@ -254,7 +254,7 @@ class Gencontrol(object): def process_package(self, in_entry, vars={}): entry = in_entry.__class__() - for key, value in in_entry.iteritems(): + for key, value in in_entry.items(): if isinstance(value, PackageRelation): value = self.process_relation(value, vars) elif isinstance(value, PackageDescription): @@ -295,6 +295,6 @@ class Gencontrol(object): def write_rfc822(self, f, list): for entry in list: - for key, value in entry.iteritems(): + for key, value in entry.items(): f.write(u"%s: %s\n" % (key, value)) f.write('\n') |