From c8316a595af9ef6336a131ead947414f32e7a8ca Mon Sep 17 00:00:00 2001 From: rdimaio Date: Thu, 7 Mar 2024 18:55:17 +0100 Subject: [PATCH] Typing: Import Sequence from collections.abc instead of typing; #6454 --- lib/rucio/core/rule.py | 4 ++-- lib/rucio/core/rule_grouping.py | 3 ++- lib/rucio/daemons/conveyor/poller.py | 3 ++- lib/rucio/transfertool/bittorrent.py | 3 ++- lib/rucio/transfertool/bittorrent_driver.py | 3 ++- lib/rucio/transfertool/bittorrent_driver_qbittorrent.py | 3 ++- lib/rucio/transfertool/mock.py | 3 ++- 7 files changed, 14 insertions(+), 8 deletions(-) diff --git a/lib/rucio/core/rule.py b/lib/rucio/core/rule.py index bd9ed813a6..75e8d4bff8 100644 --- a/lib/rucio/core/rule.py +++ b/lib/rucio/core/rule.py @@ -15,14 +15,14 @@ import json import logging -from collections.abc import Iterable, Iterator +from collections.abc import Iterable, Iterator, Sequence from configparser import NoOptionError, NoSectionError from copy import deepcopy from datetime import datetime, timedelta from os import path from re import match from string import Template -from typing import TYPE_CHECKING, Any, Callable, Literal, Optional, Type, TypeVar, Sequence +from typing import TYPE_CHECKING, Any, Callable, Literal, Optional, Type, TypeVar from dogpile.cache.api import NO_VALUE from sqlalchemy import select, update diff --git a/lib/rucio/core/rule_grouping.py b/lib/rucio/core/rule_grouping.py index 9661c7d262..6b421e9a1e 100644 --- a/lib/rucio/core/rule_grouping.py +++ b/lib/rucio/core/rule_grouping.py @@ -14,8 +14,9 @@ # limitations under the License. import logging +from collections.abc import Sequence from datetime import datetime -from typing import TYPE_CHECKING, Sequence, Any +from typing import TYPE_CHECKING, Any from sqlalchemy import func from sqlalchemy.orm.exc import NoResultFound diff --git a/lib/rucio/daemons/conveyor/poller.py b/lib/rucio/daemons/conveyor/poller.py index 3d71a14c92..7ceaab6687 100644 --- a/lib/rucio/daemons/conveyor/poller.py +++ b/lib/rucio/daemons/conveyor/poller.py @@ -24,9 +24,10 @@ import re import threading import time +from collections.abc import Sequence from itertools import groupby from types import FrameType -from typing import TYPE_CHECKING, Any, Mapping, Optional, Sequence +from typing import TYPE_CHECKING, Any, Mapping, Optional from requests.exceptions import RequestException from sqlalchemy.exc import DatabaseError diff --git a/lib/rucio/transfertool/bittorrent.py b/lib/rucio/transfertool/bittorrent.py index 8fc1281702..03744722d6 100644 --- a/lib/rucio/transfertool/bittorrent.py +++ b/lib/rucio/transfertool/bittorrent.py @@ -15,8 +15,9 @@ import base64 import logging +from collections.abc import Sequence from os import path -from typing import TYPE_CHECKING, Any, Mapping, Optional, Sequence, Type +from typing import TYPE_CHECKING, Any, Mapping, Optional, Type from rucio.common import types from rucio.common.config import config_get diff --git a/lib/rucio/transfertool/bittorrent_driver.py b/lib/rucio/transfertool/bittorrent_driver.py index 63679fa4f4..59324b2e7b 100644 --- a/lib/rucio/transfertool/bittorrent_driver.py +++ b/lib/rucio/transfertool/bittorrent_driver.py @@ -15,7 +15,8 @@ import logging from abc import ABCMeta, abstractmethod -from typing import TYPE_CHECKING, Sequence +from collections.abc import Sequence +from typing import TYPE_CHECKING from rucio.common import types diff --git a/lib/rucio/transfertool/bittorrent_driver_qbittorrent.py b/lib/rucio/transfertool/bittorrent_driver_qbittorrent.py index 81f57d54c0..a5cdef6d8d 100644 --- a/lib/rucio/transfertool/bittorrent_driver_qbittorrent.py +++ b/lib/rucio/transfertool/bittorrent_driver_qbittorrent.py @@ -14,7 +14,8 @@ # limitations under the License. import logging -from typing import TYPE_CHECKING, cast, Optional, Sequence +from collections.abc import Sequence +from typing import TYPE_CHECKING, cast, Optional from urllib.parse import urlparse import qbittorrentapi diff --git a/lib/rucio/transfertool/mock.py b/lib/rucio/transfertool/mock.py index 73b2d2cf1f..b086287af3 100644 --- a/lib/rucio/transfertool/mock.py +++ b/lib/rucio/transfertool/mock.py @@ -16,7 +16,8 @@ import itertools import logging import uuid -from typing import TYPE_CHECKING, Any, Optional, Sequence +from collections.abc import Sequence +from typing import TYPE_CHECKING, Any, Optional from rucio.db.sqla.constants import RequestState from rucio.transfertool.transfertool import Transfertool, TransferToolBuilder, TransferStatusReport