From nobody Mon Nov 25 02:29:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1719444244; cv=none; d=zohomail.com; s=zohoarc; b=XxS4AJCIX36gDnqQHdSCkTd4NWWQTZV3NXTtzhalSxwB7uRyvDmRGyB6WA4bW4kD1CxKN2OkIAb8UR9dxi3A4+S7GcAEzCMwsRONetZbx2LKdlMzc4A1DZNL6YqYAJfGbQ+ddkNFnTlK2pOwT8xJytpNI9Eh560cvDVeWQyqY9E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1719444244; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=QXnieYXmBiBT140D1yWQStaAtYrvr8Ze4CKBLC3cBsg=; b=UoW9vd0jSboYGUopAUMMTS16OrnKnqRz47rexi+x1q1UZh+kK9Mquent0XEhqR2I0Fo0p2OzkRBnfuaZRQljM7DsdYvJoDpyI2YogVL0RD2gParzpUEr5wsP/aD3qiptLD75F9V1SyfMu6Izvz8Bj0sGcVYOjS7TO784LewErT4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1719444244896495.39896362409456; Wed, 26 Jun 2024 16:24:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sMbyk-0000i2-Oz; Wed, 26 Jun 2024 19:23:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sMbyc-0000eh-Q1 for qemu-devel@nongnu.org; Wed, 26 Jun 2024 19:23:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sMbyZ-0002qW-S5 for qemu-devel@nongnu.org; Wed, 26 Jun 2024 19:22:57 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-113-AlG6fPNKNredV7WJE-XCjQ-1; Wed, 26 Jun 2024 19:22:50 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BC8F11955F0D; Wed, 26 Jun 2024 23:22:47 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.16.58]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8BD1C19560AB; Wed, 26 Jun 2024 23:22:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1719444174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QXnieYXmBiBT140D1yWQStaAtYrvr8Ze4CKBLC3cBsg=; b=CTDA/+Z8pjB5FmRHRzERYT7WYfMi1H4eX3SCK7hFJ1iFhKDovte7ruNp3254dp0H0h1Zzx 74eQWSxjRcRelZOdH6hRanXvFQAPN5WX82WsAaq0j1YFN/asEnAcxy2C13Q/FUHWxoVcSw 7kTHOC9MKR5a2HOr5vAw12Y8OYJU69c= X-MC-Unique: AlG6fPNKNredV7WJE-XCjQ-1 From: John Snow To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , John Snow , Kevin Wolf , Beraldo Leal , Thomas Huth , Hanna Reitz Subject: [PATCH 3/4] iotests: Change imports for Python 3.13 Date: Wed, 26 Jun 2024 19:22:29 -0400 Message-ID: <20240626232230.408004-4-jsnow@redhat.com> In-Reply-To: <20240626232230.408004-1-jsnow@redhat.com> References: <20240626232230.408004-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 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=170.10.129.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.207, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1719444245747100009 Content-Type: text/plain; charset="utf-8" Python 3.13 isn't out yet, but it's in beta and Fedora is ramping up to make it the default system interpreter for Fedora 41. They moved our cheese for where ContextManager lives; add a conditional to locate it while we support both pre-3.9 and 3.13+. Signed-off-by: John Snow --- tests/qemu-iotests/testenv.py | 7 ++++++- tests/qemu-iotests/testrunner.py | 9 ++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py index 588f30a4f14..96d69e56963 100644 --- a/tests/qemu-iotests/testenv.py +++ b/tests/qemu-iotests/testenv.py @@ -25,7 +25,12 @@ import random import subprocess import glob -from typing import List, Dict, Any, Optional, ContextManager +from typing import List, Dict, Any, Optional + +if sys.version_info >=3D (3, 9): + from contextlib import AbstractContextManager as ContextManager +else: + from typing import ContextManager =20 DEF_GDB_OPTIONS =3D 'localhost:12345' =20 diff --git a/tests/qemu-iotests/testrunner.py b/tests/qemu-iotests/testrunn= er.py index 7b322272e92..2e236c8fa39 100644 --- a/tests/qemu-iotests/testrunner.py +++ b/tests/qemu-iotests/testrunner.py @@ -27,11 +27,14 @@ import shutil import sys from multiprocessing import Pool -from typing import List, Optional, Any, Sequence, Dict, \ - ContextManager - +from typing import List, Optional, Any, Sequence, Dict from testenv import TestEnv =20 +if sys.version_info >=3D (3, 9): + from contextlib import AbstractContextManager as ContextManager +else: + from typing import ContextManager + =20 def silent_unlink(path: Path) -> None: try: --=20 2.45.0