External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 03:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

python3: Replace keys() + sort() with sorted()

Browse Source 
The keys() method no longer returns a list, so converting the
return value would be necessary before calling sort() on it;
alternatively, we can just call sorted(), which returns a
sorted list.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Andrea Bolognani 2018-03-15 10:51:57 +01:00
parent 9176b42bdb
commit e379dcce57
3 changed files with 26 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
docs/apibuild.py
View File

@ -133,8 +133,7 @@ def uniq(items):
d = {} d = {}
for item in items: for item in items:
d[item]=1 d[item]=1
k = d.keys() k = sorted(d.keys())
k.sort()
return k return k
class identifier: class identifier:
@ -2337,8 +2336,7 @@ class docBuilder:
if desc.find("DEPRECATED") != -1: if desc.find("DEPRECATED") != -1:
output.write(" <deprecated/>\n") output.write(" <deprecated/>\n")
ids = dict.macros.keys() ids = sorted(dict.macros.keys())
ids.sort()
for id in uniq(ids): for id in uniq(ids):
# Macros are sometime used to masquerade other types. # Macros are sometime used to masquerade other types.
if id in dict.functions: if id in dict.functions:
@ -2354,31 +2352,25 @@ class docBuilder:
if id in dict.enums: if id in dict.enums:
continue continue
output.write(" <exports symbol='%s' type='macro'/>\n" % (id)) output.write(" <exports symbol='%s' type='macro'/>\n" % (id))
ids = dict.enums.keys() ids = sorted(dict.enums.keys())
ids.sort()
for id in uniq(ids): for id in uniq(ids):
output.write(" <exports symbol='%s' type='enum'/>\n" % (id)) output.write(" <exports symbol='%s' type='enum'/>\n" % (id))
ids = dict.typedefs.keys() ids = sorted(dict.typedefs.keys())
ids.sort()
for id in uniq(ids): for id in uniq(ids):
output.write(" <exports symbol='%s' type='typedef'/>\n" % (id)) output.write(" <exports symbol='%s' type='typedef'/>\n" % (id))
ids = dict.structs.keys() ids = sorted(dict.structs.keys())
ids.sort()
for id in uniq(ids): for id in uniq(ids):
output.write(" <exports symbol='%s' type='struct'/>\n" % (id)) output.write(" <exports symbol='%s' type='struct'/>\n" % (id))
ids = dict.variables.keys() ids = sorted(dict.variables.keys())
ids.sort()
for id in uniq(ids): for id in uniq(ids):
output.write(" <exports symbol='%s' type='variable'/>\n" % (id)) output.write(" <exports symbol='%s' type='variable'/>\n" % (id))
ids = dict.functions.keys() ids = sorted(dict.functions.keys())
ids.sort()
for id in uniq(ids): for id in uniq(ids):
output.write(" <exports symbol='%s' type='function'/>\n" % (id)) output.write(" <exports symbol='%s' type='function'/>\n" % (id))
output.write(" </file>\n") output.write(" </file>\n")
def serialize_xrefs_files(self, output): def serialize_xrefs_files(self, output):
headers = self.headers.keys() headers = sorted(self.headers.keys())
headers.sort()
for file in headers: for file in headers:
module = self.modulename_file(file) module = self.modulename_file(file)
output.write(" <file name='%s'>\n" % (module)) output.write(" <file name='%s'>\n" % (module))
@ -2410,8 +2402,7 @@ class docBuilder:
funcs[param[0]] = [name] funcs[param[0]] = [name]
except: except:
pass pass
typ = funcs.keys() typ = sorted(funcs.keys())
typ.sort()
for type in typ: for type in typ:
if type == '' or type == 'void' or type == "int" or \ if type == '' or type == 'void' or type == "int" or \
type == "char *" or type == "const char *" : type == "char *" or type == "const char *" :
@ -2440,23 +2431,20 @@ class docBuilder:
funcs[ret[0]] = [name] funcs[ret[0]] = [name]
except: except:
pass pass
typ = funcs.keys() typ = sorted(funcs.keys())
typ.sort()
for type in typ: for type in typ:
if type == '' or type == 'void' or type == "int" or \ if type == '' or type == 'void' or type == "int" or \
type == "char *" or type == "const char *" : type == "char *" or type == "const char *" :
continue continue
output.write(" <type name='%s'>\n" % (type)) output.write(" <type name='%s'>\n" % (type))
ids = funcs[type] ids = sorted(funcs[type])
ids.sort()
for id in ids: for id in ids:
output.write(" <ref name='%s'/>\n" % (id)) output.write(" <ref name='%s'/>\n" % (id))
output.write(" </type>\n") output.write(" </type>\n")
def serialize_xrefs_alpha(self, output): def serialize_xrefs_alpha(self, output):
letter = None letter = None
ids = self.idx.identifiers.keys() ids = sorted(self.idx.identifiers.keys())
ids.sort()
for id in ids: for id in ids:
if id[0] != letter: if id[0] != letter:
if letter is not None: if letter is not None:
@ -2468,8 +2456,7 @@ class docBuilder:
output.write(" </letter>\n") output.write(" </letter>\n")
def serialize_xrefs_references(self, output): def serialize_xrefs_references(self, output):
typ = self.idx.identifiers.keys() typ = sorted(self.idx.identifiers.keys())
typ.sort()
for id in typ: for id in typ:
idf = self.idx.identifiers[id] idf = self.idx.identifiers[id]
module = idf.header module = idf.header
@ -2480,8 +2467,7 @@ class docBuilder:
def serialize_xrefs_index(self, output): def serialize_xrefs_index(self, output):
index = self.xref index = self.xref
typ = index.keys() typ = sorted(index.keys())
typ.sort()
letter = None letter = None
count = 0 count = 0
chunk = 0 chunk = 0
@ -2553,30 +2539,24 @@ class docBuilder:
output.write('<?xml version="1.0" encoding="ISO-8859-1"?>\n') output.write('<?xml version="1.0" encoding="ISO-8859-1"?>\n')
output.write("<api name='%s'>\n" % self.name) output.write("<api name='%s'>\n" % self.name)
output.write(" <files>\n") output.write(" <files>\n")
headers = self.headers.keys() headers = sorted(self.headers.keys())
headers.sort()
for file in headers: for file in headers:
self.serialize_exports(output, file) self.serialize_exports(output, file)
output.write(" </files>\n") output.write(" </files>\n")
output.write(" <symbols>\n") output.write(" <symbols>\n")
macros = self.idx.macros.keys() macros = sorted(self.idx.macros.keys())
macros.sort()
for macro in macros: for macro in macros:
self.serialize_macro(output, macro) self.serialize_macro(output, macro)
enums = self.idx.enums.keys() enums = sorted(self.idx.enums.keys())
enums.sort()
for enum in enums: for enum in enums:
self.serialize_enum(output, enum) self.serialize_enum(output, enum)
typedefs = self.idx.typedefs.keys() typedefs = sorted(self.idx.typedefs.keys())
typedefs.sort()
for typedef in typedefs: for typedef in typedefs:
self.serialize_typedef(output, typedef) self.serialize_typedef(output, typedef)
variables = self.idx.variables.keys() variables = sorted(self.idx.variables.keys())
variables.sort()
for variable in variables: for variable in variables:
self.serialize_variable(output, variable) self.serialize_variable(output, variable)
functions = self.idx.functions.keys() functions = sorted(self.idx.functions.keys())
functions.sort()
for function in functions: for function in functions:
self.serialize_function(output, function) self.serialize_function(output, function)
output.write(" </symbols>\n") output.write(" </symbols>\n")

15
src/esx/esx_vi_generator.py
View File

@ -1704,8 +1704,7 @@ types_typedef.write(separator +
" * VI Enums\n" + " * VI Enums\n" +
" */\n\n") " */\n\n")
names = enums_by_name.keys() names = sorted(enums_by_name.keys())
names.sort()
for name in names: for name in names:
types_typedef.write(enums_by_name[name].generate_typedef()) types_typedef.write(enums_by_name[name].generate_typedef())
@ -1726,8 +1725,7 @@ types_typeenum.write("\n")
types_typetostring.write("\n") types_typetostring.write("\n")
types_typefromstring.write("\n") types_typefromstring.write("\n")
names = objects_by_name.keys() names = sorted(objects_by_name.keys())
names.sort()
for name in names: for name in names:
types_typedef.write(objects_by_name[name].generate_typedef()) types_typedef.write(objects_by_name[name].generate_typedef())
@ -1748,8 +1746,7 @@ types_typeenum.write("\n")
types_typetostring.write("\n") types_typetostring.write("\n")
types_typefromstring.write("\n") types_typefromstring.write("\n")
names = managed_objects_by_name.keys() names = sorted(managed_objects_by_name.keys())
names.sort()
for name in names: for name in names:
types_typedef.write(managed_objects_by_name[name].generate_typedef()) types_typedef.write(managed_objects_by_name[name].generate_typedef())
@ -1762,8 +1759,7 @@ for name in names:
# output methods # output methods
names = methods_by_name.keys() names = sorted(methods_by_name.keys())
names.sort()
for name in names: for name in names:
methods_header.write(methods_by_name[name].generate_header()) methods_header.write(methods_by_name[name].generate_header())
@ -1782,8 +1778,7 @@ for name in names:
# output helpers # output helpers
names = managed_objects_by_name.keys() names = sorted(managed_objects_by_name.keys())
names.sort()
for name in names: for name in names:
helpers_header.write(managed_objects_by_name[name].generate_helper_header()) helpers_header.write(managed_objects_by_name[name].generate_helper_header())

3
src/hyperv/hyperv_wmi_generator.py
View File

@ -501,8 +501,7 @@ def main():
classes_header.write(notice) classes_header.write(notice)
classes_source.write(notice) classes_source.write(notice)
names = wmi_classes_by_name.keys() names = sorted(wmi_classes_by_name.keys())
names.sort()
for name in names: for name in names:
cls = wmi_classes_by_name[name] cls = wmi_classes_by_name[name]