From 9e0335d129d9f1808d04e39e39608fdd804ca332 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Tue, 6 Mar 2018 11:29:34 -0500 Subject: [PATCH] qapi: adapt to moved location of StringIO module in py3 Backports commit 5f90af8e6b34f9e6b60eb05a15707a95a0febbde from qemu --- qemu/scripts/qapi.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qemu/scripts/qapi.py b/qemu/scripts/qapi.py index 5ac4ba6d..0f378a7b 100644 --- a/qemu/scripts/qapi.py +++ b/qemu/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 = { 'str': 'QTYPE_QSTRING', @@ -1997,8 +2001,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')