672f70aa3d
Update to 2.11.1, plus a few other fixes. OBS-URL: https://build.opensuse.org/request/show/579209 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=392
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
From 474475499831d76f92dcdde71ff2d0a29205f2ff Mon Sep 17 00:00:00 2001
|
|
From: "Daniel P. Berrange" <berrange@redhat.com>
|
|
Date: Tue, 16 Jan 2018 13:42:07 +0000
|
|
Subject: [PATCH] qapi: adapt to moved location of StringIO module in py3
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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>
|
|
(cherry picked from commit 5f90af8e6b34f9e6b60eb05a15707a95a0febbde)
|
|
[BR: BSC#1077564]
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
scripts/qapi.py | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/scripts/qapi.py b/scripts/qapi.py
|
|
index dba6cd6779..7882ae77fb 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',
|
|
@@ -2004,8 +2008,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')
|