mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-01 14:53:54 -06:00
qapi: adapt to moved location of StringIO module in py3
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Message-Id: <20180116134217.8725-5-berrange@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
38710a8994
commit
5f90af8e6b
1 changed files with 5 additions and 2 deletions
|
@ -22,6 +22,10 @@ try:
|
||||||
from collections import OrderedDict
|
from collections import OrderedDict
|
||||||
except:
|
except:
|
||||||
from ordereddict import OrderedDict
|
from ordereddict import OrderedDict
|
||||||
|
try:
|
||||||
|
from StringIO import StringIO
|
||||||
|
except ImportError:
|
||||||
|
from io import StringIO
|
||||||
|
|
||||||
builtin_types = {
|
builtin_types = {
|
||||||
'null': 'QTYPE_QNULL',
|
'null': 'QTYPE_QNULL',
|
||||||
|
@ -1995,8 +1999,7 @@ def open_output(output_dir, do_c, do_h, prefix, c_file, h_file,
|
||||||
if really:
|
if really:
|
||||||
return open(name, opt)
|
return open(name, opt)
|
||||||
else:
|
else:
|
||||||
import StringIO
|
return StringIO()
|
||||||
return StringIO.StringIO()
|
|
||||||
|
|
||||||
fdef = maybe_open(do_c, c_file, 'w')
|
fdef = maybe_open(do_c, c_file, 'w')
|
||||||
fdecl = maybe_open(do_h, h_file, 'w')
|
fdecl = maybe_open(do_h, h_file, 'w')
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue