From nobody Mon Feb 9 23:17:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 151370550271155.86610284111043; Tue, 19 Dec 2017 09:45:02 -0800 (PST) Received: from localhost ([::1]:56716 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eRLwo-0000rS-Lu for importer@patchew.org; Tue, 19 Dec 2017 12:44:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32784) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eRLoQ-0002It-9O for qemu-devel@nongnu.org; Tue, 19 Dec 2017 12:36:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eRLoL-0001nz-IX for qemu-devel@nongnu.org; Tue, 19 Dec 2017 12:36:18 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:42346) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eRLoL-0001ng-Dv; Tue, 19 Dec 2017 12:36:13 -0500 Received: by mail-qt0-x244.google.com with SMTP id g9so25130173qth.9; Tue, 19 Dec 2017 09:36:13 -0800 (PST) Received: from x1.local ([138.117.48.211]) by smtp.gmail.com with ESMTPSA id z17sm9295525qti.59.2017.12.19.09.36.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Dec 2017 09:36:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KLwRckLENHthGgrTU6zVlFxbTOmmFebc3fomKtcccVM=; b=AJlhnvVEhDUAwMsysWCAnqdJ20Bg8f5ExmI9h5uowR2j3xjAoAokz7wg1Qgr1/kPcj nG5XwGjV56qglx+RLsAbSWktEkoS03VrGalPzQwJ9RiO5emZQ1+gAoPlcZtZ9rc7HGAb sj700Zw84aINeTa8XlAdwN9BTBqvQM9segrDN7jc94MY0d37VOHkoqQuG6AAiRSCF8ht 7YEOGvLSE9oGmqDJ6rYdQcStBQ0rMmEB80QNWfOjzwDS3+aKDhz1F5A2KpERJDnnF/2p Fy+XktL0db1LOV0Gn6+jT+wQcrq4FUFhbVH/o0VOEb4pdin1t0pzzS2Qms1ERkt17hrm B4Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=KLwRckLENHthGgrTU6zVlFxbTOmmFebc3fomKtcccVM=; b=orxZt/e/ufL7ynSJBDCeKZVe4QOiLVQgehu932gRL6VSxeTd2pjqCg3m80IIutf663 oc2MWftR/nIgis8211W0/fW35Q37I0x8RtRwTetRMjkxboijWW/JpcDWFiIgtvZw8V/1 rXzltZiZ4du88B7G8x3JlJPa7tf0651PYfavctc0rOpixDLrgy4HnZyeuZmefMoCZiFq A+cDaCORdi5wyQovKEOvcPQYOpdnytiibPmMEkJx+5W9jf64Qej+VQ7+sCJk2DoCY4NN oFl40FapLAidL6AUF1/PzfAxXcoNyrlDdKtKGsgX9Zbwget7033VNf0ZStkXM8lwUXt/ Z3XQ== X-Gm-Message-State: AKGB3mISQKbf3yJldO6+id7LTnDDhQmOUaoM9Sjzq3nHkViOD05quQTn FO+3zIb1AT1vJQ/YC62lrPc= X-Google-Smtp-Source: ACJfBouO2CwBR0AB2xJu9XibqWn91fDyG1GZBqXgb70482OewyIp3zwwBVYyLrIbFo/DqJ0ys34LIg== X-Received: by 10.237.33.205 with SMTP id m13mr6277662qtc.131.1513704972917; Tue, 19 Dec 2017 09:36:12 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Kevin Wolf , Max Reitz , Cleber Rosa , Eduardo Habkost , =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= , "Daniel P . Berrange" , Eric Blake , Stefan Hajnoczi , Fam Zheng , Markus Armbruster Date: Tue, 19 Dec 2017 14:34:25 -0300 Message-Id: <20171219173425.8113-10-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171219173425.8113-1-f4bug@amsat.org> References: <20171219173425.8113-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH 9/9] iotests.py: use io.StringIO with 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: Janosch Frank , qemu-block@nongnu.org, Nir Soffer , Ishani Chugh , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Paolo Bonzini , John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrange --- tests/qemu-iotests/iotests.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 4c515d2e6c..0e1b8ab6e6 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -459,13 +459,16 @@ def main(supported_fmts=3D[], supported_oses=3D['linu= x']): =20 # We need to filter out the time taken from the output so that qemu-io= test # can reliably diff the results against master output. - import StringIO if debug: output =3D sys.stdout verbosity =3D 2 sys.argv.remove('-d') else: - output =3D StringIO.StringIO() + try: + from StringIO import StringIO + except ImportError: + from io import StringIO + output =3D StringIO() =20 logging.basicConfig(level=3D(logging.DEBUG if debug else logging.WARN)) =20 --=20 2.15.1