From patchwork Thu Jun 21 06:25:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 139452 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1672394lji; Wed, 20 Jun 2018 23:29:26 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJ42c2b5JobJDF9kCSvHPe13qKly0xqhPjQFnwzqpIf8uZSusJyXQRoe9m6k7tJLlGWoPjS X-Received: by 2002:a37:678b:: with SMTP id b133-v6mr20430523qkc.54.1529562566489; Wed, 20 Jun 2018 23:29:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529562566; cv=none; d=google.com; s=arc-20160816; b=a23LJg6ALVp0+YnQfJyOEJDly86sgkUoV+gsOHlNRx11FgJqwbz2nORYpFx6Ph59eg mZ/KHGIY1rP94yh7IcLHbfFWb9HYCeRsBvVb2l0GcP7pf7q7GkefY2mJIDXemELRps13 BJn8pzDTC9r1Y9ruCDftseA8u1lZqxFwf2FtDmVXE93KKlJd0X+GzqIiVlSY56wbKt9c dOwz7bLjuqZ1jr51/qUxwNqHkywPJO7v3wqPOesUPVZM3eiJk95J5hTg43BBo5mXIyJD gJzakpbr9iFfy1kFP9MfKqXXFW3k9xPp01JTsgsOj9ZdOxp/04ogu+wGvxMULU1+rsS/ gHKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=YGcHFBtGXtt6z0PyaNbr3NVGLgMZBuZlJZcm6dYhGck=; b=M8KAzb8I/aOAd62rNivuavS4ZqFJFWgOBzu1OK7R+rvjdmZtMuQ6QI/X7le3JWoHxn iCRke+FNarSMkJa+lrkmMT3yHjHxOWuDzrPmiy8djGaaq+MOtsIaAHKRH8Ob6obH/g26 dLqjsVoB9NNlk9oMi/Z0h5KIY7Ns1U9xipM1bL6Pe4VhkhAm5ekAUcBD5/dmeEV9KG3P eep/zFyXnK+7S11U3dbjgwkYPS4S/X0Bqygsi9KOaBS+T3gagm4aQoSwk2gCL3j2ErHs EmMuX2/89OyWBqryTTTNT8kim5ft3hJFBmfkx5s6s/IMQEJlt9+48hXsHUKi2Fhdzguh mowA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PXqnEM5N; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id m9-v6si3930563qkk.386.2018.06.20.23.29.26 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 20 Jun 2018 23:29:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PXqnEM5N; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53253 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVt5x-0003Do-Sr for patch@linaro.org; Thu, 21 Jun 2018 02:29:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53010) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVt2p-0000su-Cf for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:26:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVt2m-0000Vc-69 for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:26:11 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:55077) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVt2l-0000Uq-Sk for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:26:08 -0400 Received: by mail-wm0-x243.google.com with SMTP id o13-v6so3083689wmf.4 for ; Wed, 20 Jun 2018 23:26:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YGcHFBtGXtt6z0PyaNbr3NVGLgMZBuZlJZcm6dYhGck=; b=PXqnEM5N7D0rmRlKfUeY5QPBAgby/9cT+xq2bsUbT6UWo9xSoz4f6xtn7yyEj2ZL0w uhNIFSykfLoZT2gTwKb3hF4N626eygQwwLF1OGUzLUZy/lKFdSVxKTENJHHWclsSQkSF R+770CEVzITz4edvxza/McAi5cytH3xviFABs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YGcHFBtGXtt6z0PyaNbr3NVGLgMZBuZlJZcm6dYhGck=; b=cvlqC5jXgEPZuAlay6IJhdIPvJgu/OALkesVY9Nib1ZfRZDN+LOdmyc4+dF494wVZj BcoAc+5yxB3HWk56oBzv9iHsED17SVMzHufEFhn71gZmRgnzzhwJXiTdPuuWYKzS8DED CWIWx4evNWdwIB7v/yFMd/6mRKW5dQQV21nSW/NVSxELrtk0XhHKZDOVJxHY9SyfgGxq 3shvDQqhJREpaV0qDoc6rrf/3e1Qn+y0NdRg0uspb2NmoqepXNWsOdhOU5FbakJWTmL3 iN7xkZ478kfiw6DSPhFA79JeEE2qJhfc8p6Z6GDSKGa00IxLDiiBlpU32jb3GEtqNhzH YMvQ== X-Gm-Message-State: APt69E3DqMEkemDkUqNDXWA7uUYylrOr7HM056l91n49OZu58hM0xk0G wXFqwjS3ze3io9XDaOyqhbrI+A== X-Received: by 2002:a1c:4596:: with SMTP id l22-v6mr4023258wmi.33.1529562366489; Wed, 20 Jun 2018 23:26:06 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b15-v6sm8014870wri.14.2018.06.20.23.26.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Jun 2018 23:26:05 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 659603E00E9; Thu, 21 Jun 2018 07:26:05 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 21 Jun 2018 07:25:09 +0100 Message-Id: <20180621062605.941-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180621062605.941-1-alex.bennee@linaro.org> References: <20180621062605.941-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PULL v2 01/57] docker: docker.py wrap StringIO import for python3 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 -- 2.17.1 Reviewed-by: Daniel P. Berrangé 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