External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

python3: Call list() explicitly as needed

Browse Source 
For list concatenation to work, the value returned by the
keys() method must be converted to a list first.

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:54:07 +01:00
parent 477502de30
commit 9176b42bdb
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
docs/apibuild.py
View File

@ -478,8 +478,8 @@ class CLexer:
return None
if line[0] == '#':
self.tokens = map((lambda x: ('preproc', x)),
line.split()))
self.tokens = list(map((lambda x: ('preproc', x)),
line.split())))
# We might have whitespace between the '#' and preproc
# macro name, so instead of having a single token element
@ -2049,13 +2049,13 @@ class docBuilder:
self.path = path
self.directories = directories
if name == "libvirt":
self.includes = includes + included_files.keys()
self.includes = includes + list(included_files.keys())
elif name == "libvirt-qemu":
self.includes = includes + qemu_included_files.keys()
self.includes = includes + list(qemu_included_files.keys())
elif name == "libvirt-lxc":
self.includes = includes + lxc_included_files.keys()
self.includes = includes + list(lxc_included_files.keys())
elif name == "libvirt-admin":
self.includes = includes + admin_included_files.keys()
self.includes = includes + list(admin_included_files.keys())
self.modules = {}
self.headers = {}
self.idx = index()
@ -2383,9 +2383,12 @@ class docBuilder:
module = self.modulename_file(file)
output.write(" <file name='%s'>\n" % (module))
dict = self.headers[file]
ids = uniq(dict.functions.keys() + dict.variables.keys() + \
dict.macros.keys() + dict.typedefs.keys() + \
dict.structs.keys() + dict.enums.keys())
ids = uniq(list(dict.functions.keys()) + \
list(dict.variables.keys()) + \
list(dict.macros.keys()) + \
list(dict.typedefs.keys()) + \
list(dict.structs.keys()) + \
list(dict.enums.keys()))
ids.sort()
for id in ids:
output.write(" <ref name='%s'/>\n" % (id))