From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, "Cleber Rosa" <crosa@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"John Snow" <jsnow@redhat.com>, "Kevin Wolf" <kwolf@redhat.com>,
"Beraldo Leal" <bleal@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Hanna Reitz" <hreitz@redhat.com>
Subject: [PATCH 3/4] iotests: Change imports for Python 3.13
Date: Wed, 26 Jun 2024 19:22:29 -0400 [thread overview]
Message-ID: <20240626232230.408004-4-jsnow@redhat.com> (raw)
In-Reply-To: <20240626232230.408004-1-jsnow@redhat.com>
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 <jsnow@redhat.com>
---
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 >= (3, 9):
+ from contextlib import AbstractContextManager as ContextManager
+else:
+ from typing import ContextManager
DEF_GDB_OPTIONS = 'localhost:12345'
diff --git a/tests/qemu-iotests/testrunner.py b/tests/qemu-iotests/testrunner.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
+if sys.version_info >= (3, 9):
+ from contextlib import AbstractContextManager as ContextManager
+else:
+ from typing import ContextManager
+
def silent_unlink(path: Path) -> None:
try:
--
2.45.0
next prev parent reply other threads:[~2024-06-26 23:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-26 23:22 [PATCH 0/4] Python: Add 3.13 support, play linter whackamole John Snow
2024-06-26 23:22 ` [PATCH 1/4] python: linter changes for pylint 3.x John Snow
2024-07-03 9:50 ` Alex Bennée
2024-06-26 23:22 ` [PATCH 2/4] python: Do not use pylint 3.2.4 with python 3.8 John Snow
2024-07-03 9:50 ` Alex Bennée
2024-06-26 23:22 ` John Snow [this message]
2024-07-01 23:44 ` [PATCH 3/4] iotests: Change imports for Python 3.13 John Snow
2024-07-02 11:52 ` Nir Soffer
2024-07-02 14:44 ` John Snow
2024-07-02 17:51 ` Nir Soffer
2024-07-03 20:12 ` John Snow
2024-06-26 23:22 ` [PATCH 4/4] python: enable testing for 3.13 John Snow
2024-07-03 10:29 ` Alex Bennée
2024-07-05 15:52 ` [PATCH 0/4] Python: Add 3.13 support, play linter whackamole John Snow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240626232230.408004-4-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=bleal@redhat.com \
--cc=crosa@redhat.com \
--cc=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).