diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2018-01-16 13:42:07 +0000 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2018-02-05 19:53:54 -0200 |
| commit | 5f90af8e6b34f9e6b60eb05a15707a95a0febbde (patch) | |
| tree | 3a67cd6aed4546ee456b5969c7f352acc6d31b2a | |
| parent | 38710a8994911d98acbe183a39ec3a53638de510 (diff) | |
| download | qemu-5f90af8e6b34f9e6b60eb05a15707a95a0febbde.zip | |
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>
| -rw-r--r-- | scripts/qapi.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/qapi.py b/scripts/qapi.py index 514b7bb5a4..514cca44bf 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') |