[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/21] qapi: adapt to moved location of StringIO modu
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 04/21] qapi: adapt to moved location of StringIO module in py3 |
Date: |
Mon, 5 Feb 2018 21:08:43 -0200 |
From: "Daniel P. Berrange" <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
scripts/qapi.py | 7 +++++--
1 file 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')
--
2.14.3
- [Qemu-devel] [PULL 00/21] Python queue, 2018-02-05, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 01/21] qapi: convert to use python print function instead of statement, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 03/21] qapi: Use OrderedDict from standard library if available, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 02/21] qapi: use items()/values() intead of iteritems()/itervalues(), Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 04/21] qapi: adapt to moved location of StringIO module in py3,
Eduardo Habkost <=
- [Qemu-devel] [PULL 06/21] qapi: remove '-q' arg to diff when comparing QAPI output, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 07/21] qapi: ensure stable sort ordering when checking QAPI entities, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 05/21] qapi: Adapt to moved location of 'maketrans' function in py3, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 08/21] qapi: force a UTF-8 locale for running Python, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 09/21] scripts: ensure signrom treats data as bytes, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 10/21] configure: allow use of python 3, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 11/21] qemu.py: remove unused import, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 12/21] qemu.py: better control of created files, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 14/21] qemu.py: always cleanup on shutdown(), Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 13/21] qemu.py: refactor launch(), Eduardo Habkost, 2018/02/05