On 01/15/2018 07:26 AM, Daniel P. Berrange wrote: > Signed-off-by: Daniel P. Berrange <berra...@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org> > --- > scripts/qapi.py | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/scripts/qapi.py b/scripts/qapi.py > index 7ec2e00b2c..eaa63a58be 100644 > --- a/scripts/qapi.py > +++ b/scripts/qapi.py > @@ -22,6 +22,10 @@ try: > from collections import OrderedDict > except: > from ordereddict import OrderedDict > +try: > + from StringIO import StringIO > +except ImportError: > + from io import StringIO > > builtin_types = { > 'null': 'QTYPE_QNULL', > @@ -1995,8 +1999,7 @@ def open_output(output_dir, do_c, do_h, prefix, c_file, > h_file, > if really: > return open(name, opt) > else: > - import StringIO > - return StringIO.StringIO() > + return StringIO() > > fdef = maybe_open(do_c, c_file, 'w') > fdecl = maybe_open(do_h, h_file, 'w') >