From 7a5d936b6fc0cf262db86af0df7999ac904f8495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Wed, 20 Jun 2018 15:45:42 +0100 Subject: docker: docker.py wrap StringIO import for python3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- tests/docker/docker.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tests/docker') 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 -- cgit v1.2.3