From nobody Wed Dec 17 21:50:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1588683881; cv=none; d=zohomail.com; s=zohoarc; b=PbPtsoMj18H2r4AGNqSp4LUA2GMuMSK2/1iUk3QJ9RRpx/XjCFTVFca2EruDQNcCk3pvNIPFVvpSIgabdGZBAOcxKqKFQe+L3ojej34nMhSWBE7QcLJkEYeqgefCNqlrbnBLjQZbZ/Oea/xTVTQrCgqY9zv9ERjTFBkCrHpYRQE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588683881; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=69sn+hnFqrL5p0Pz7Z1IzCwG6ftghBseFxblIzKJAQ8=; b=gAVsJnaa9q9XpV0CdHWl0U9RLyzkXxzN+km9ZgMZJasi2GWYd2T/OVAB/zTNdTVxhokZnOI0SGorFGCb2rWoxU+DWP6p7f8jFQo6Pv9tZp93KxKCu67KZhPLazb5Y8KkRd8YkSNrSp8O8WFlPwEdTTAZhRTQAwpgF0Wgl2B8QL0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588683881277696.2832318274558; Tue, 5 May 2020 06:04:41 -0700 (PDT) Received: from localhost ([::1]:44912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVxFX-0000yO-UA for importer@patchew.org; Tue, 05 May 2020 09:04:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVx9t-0001Fl-Py for qemu-devel@nongnu.org; Tue, 05 May 2020 08:58:49 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:27735 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jVx9s-0000m0-Ev for qemu-devel@nongnu.org; Tue, 05 May 2020 08:58:49 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-312-Pt6-P0E6MCuV1Q80vgyQVg-1; Tue, 05 May 2020 08:58:45 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9F378A0BF6; Tue, 5 May 2020 12:58:43 +0000 (UTC) Received: from localhost (ovpn-113-206.ams2.redhat.com [10.36.113.206]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4162E1053B00; Tue, 5 May 2020 12:58:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588683527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=69sn+hnFqrL5p0Pz7Z1IzCwG6ftghBseFxblIzKJAQ8=; b=bTDH14ZcNCFhhEwPSEl7T3qDSEFCV20i7yYzMSdU/IDt/ivFj1aNDYJJuKDWYhM6ui27LF 2BfhgQHV/rbSu3gCHN2xYWz59hQU+/zjd3uZ8byPlQ5b4mcNB1MPe08w+ZY5c0EFZne0GS pXcf8QyQOFKEKOLdHsTuY59UGHGWq+s= X-MC-Unique: Pt6-P0E6MCuV1Q80vgyQVg-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PULL 07/24] iotests: drop pre-Python 3.4 compatibility code Date: Tue, 5 May 2020 14:58:09 +0200 Message-Id: <20200505125826.1001451-8-mreitz@redhat.com> In-Reply-To: <20200505125826.1001451-1-mreitz@redhat.com> References: <20200505125826.1001451-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=mreitz@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/05 03:48:16 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Peter Maydell , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: John Snow We no longer need to accommodate <3.4, drop this code. (The lines were > 79 chars and it stood out.) Signed-off-by: John Snow Reviewed-by: Max Reitz Message-Id: <20200331000014.11581-8-jsnow@redhat.com> Reviewed-by: Kevin Wolf Signed-off-by: Max Reitz --- tests/qemu-iotests/iotests.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index dae124872e..374a8f6077 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -360,12 +360,9 @@ def log(msg, filters=3D(), indent=3DNone): for flt in filters: msg =3D flt(msg) if isinstance(msg, (dict, list)): - # Python < 3.4 needs to know not to add whitespace when pretty-pri= nting: - separators =3D (', ', ': ') if indent is None else (',', ': ') # Don't sort if it's already sorted do_sort =3D not isinstance(msg, OrderedDict) - print(json.dumps(msg, sort_keys=3Ddo_sort, - indent=3Dindent, separators=3Dseparators)) + print(json.dumps(msg, sort_keys=3Ddo_sort, indent=3Dindent)) else: print(msg) =20 --=20 2.26.2