diff options
| author | Alex Bennée | 2018-06-20 16:45:42 +0200 |
|---|---|---|
| committer | Alex Bennée | 2018-06-20 17:57:34 +0200 |
| commit | 7a5d936b6fc0cf262db86af0df7999ac904f8495 (patch) | |
| tree | 36a1756cfecb3f081a33fbe3c7bb27751261b1ed /tests/docker | |
| parent | Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20180619' into staging (diff) | |
| download | qemu-7a5d936b6fc0cf262db86af0df7999ac904f8495.tar.gz qemu-7a5d936b6fc0cf262db86af0df7999ac904f8495.tar.xz qemu-7a5d936b6fc0cf262db86af0df7999ac904f8495.zip | |
docker: docker.py wrap StringIO import for python3
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 <alex.bennee@linaro.org>
Diffstat (limited to 'tests/docker')
| -rwxr-xr-x | tests/docker/docker.py | 5 |
1 files changed, 4 insertions, 1 deletions
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 |