debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

debian/control: Make field ordering consistent again 

This regressed when switching to Python 3 and not consistently
replacing use of iter*() methods.
This commit is contained in:
Ben Hutchings 2015-10-29 12:06:25 +00:00
parent ea6cccbad9
commit 0b7b6d7a62
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
debian/lib/python/debian_linux/debian.py vendored
View File

@ -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]

4
debian/lib/python/debian_linux/gencontrol.py vendored
View File

@ -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')