iotests: Change imports for Python 3.13

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>
Message-id: 20240626232230.408004-4-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
John Snow 2024-06-26 19:22:29 -04:00
parent c5be244534
commit e38900450f
2 changed files with 12 additions and 4 deletions

View File

@ -25,7 +25,12 @@ import collections
import random import random
import subprocess import subprocess
import glob 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' DEF_GDB_OPTIONS = 'localhost:12345'

View File

@ -27,11 +27,14 @@ import json
import shutil import shutil
import sys import sys
from multiprocessing import Pool from multiprocessing import Pool
from typing import List, Optional, Any, Sequence, Dict, \ from typing import List, Optional, Any, Sequence, Dict
ContextManager
from testenv import TestEnv 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: def silent_unlink(path: Path) -> None:
try: try: