Skip to content

V
varnish-cache
Commit 840e966d authored by Guillaume Quintard's avatar Guillaume Quintard Committed by guillaume quintard
Browse files
Options

python3 compatibility 

.keys() doesn't produce a list in python3, only an iterable view
parent 61573d29
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 8 deletions
lib/libvcc/vmodtool.py
View file @ 840e966d
...@@ -801,8 +801,7 @@ class vcc(object): ...@@ -801,8 +801,7 @@ class vcc(object):
fo.write("#endif\n") fo.write("#endif\n")
fo.write("\n") fo.write("\n")
l = enum_values.keys() l = sorted(enum_values)
l.sort()
for j in l: for j in l:
fo.write("extern VCL_ENUM %senum_%s;\n" % (self.sympfx, j)) fo.write("extern VCL_ENUM %senum_%s;\n" % (self.sympfx, j))
fo.write("\n") fo.write("\n")
...@@ -817,8 +816,7 @@ class vcc(object): ...@@ -817,8 +816,7 @@ class vcc(object):
for j in self.contents: for j in self.contents:
j.cstruct(fo) j.cstruct(fo)
fo.write("\n") fo.write("\n")
l = enum_values.keys() l = sorted(enum_values)
l.sort()
for j in l: for j in l:
fo.write("\tVCL_ENUM\t\t\t*enum_%s;\n" % j) fo.write("\tVCL_ENUM\t\t\t*enum_%s;\n" % j)
fo.write("};\n") fo.write("};\n")
...@@ -828,8 +826,7 @@ class vcc(object): ...@@ -828,8 +826,7 @@ class vcc(object):
for j in self.contents: for j in self.contents:
j.cstruct_init(fo) j.cstruct_init(fo)
fo.write("\n") fo.write("\n")
l = enum_values.keys() l = sorted(enum_values)
l.sort()
for j in l: for j in l:
fo.write("\t&%senum_%s,\n" % (self.sympfx, j)) fo.write("\t&%senum_%s,\n" % (self.sympfx, j))
fo.write("};\n") fo.write("};\n")
...@@ -887,8 +884,7 @@ class vcc(object): ...@@ -887,8 +884,7 @@ class vcc(object):
fo.write("\n") fo.write("\n")
l = enum_values.keys() l = sorted(enum_values)
l.sort()
for j in l: for j in l:
fo.write('VCL_ENUM %senum_%s = "%s";\n' % (self.sympfx, j, j)) fo.write('VCL_ENUM %senum_%s = "%s";\n' % (self.sympfx, j, j))
fo.write("\n") fo.write("\n")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment