[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 01/57] docker: docker.py wrap StringIO import for
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL v2 01/57] docker: docker.py wrap StringIO import for python3 |
Date: |
Thu, 21 Jun 2018 07:25:09 +0100 |
Although the docker.py is nominally python2 we actually invoke it with
the configured python from the configure script.
Signed-off-by: Alex Bennée <address@hidden>
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 306e14cf69..e4095270eb 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -26,7 +26,10 @@ import tempfile
import re
import signal
from tarfile import TarFile, TarInfo
-from StringIO import StringIO
+try:
+ from StringIO import StringIO
+except ImportError:
+ from io import StringIO
from shutil import copy, rmtree
from pwd import getpwuid
--
2.17.1
- [Qemu-devel] [PULL v2 00/57] add check-tcg and associated machinery, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 04/57] configure: allow user to specify --cross-cc-cflags-foo=, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 03/57] configure: move i386_cc to cross_cc_i386, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 01/57] docker: docker.py wrap StringIO import for python3,
Alex Bennée <=
- [Qemu-devel] [PULL v2 06/57] docker: Add "cc" subcommand, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 05/57] configure: set cross_cc_FOO for host compiler, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 02/57] configure: add support for --cross-cc-FOO, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 07/57] docker: extend "cc" command to accept compiler, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 09/57] docker: Makefile.include introduce DOCKER_SCRIPT, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 08/57] docker: allow "cc" command to run in user context, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 10/57] tests/tcg: move architecture independent tests into subdir, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 48/57] tests/tcg: override runners for broken tests, Alex Bennée, 2018/06/21