Commit 5f90af8e authored by Daniel P. Berrangé's avatar Daniel P. Berrangé Committed by Eduardo Habkost
Browse files

qapi: adapt to moved location of StringIO module in py3 



Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Message-Id: <20180116134217.8725-5-berrange@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 38710a89

scripts/qapi.py

+5 −2
Original line number Diff line number Diff line
@@ -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')