Typing: Import Sequence from collections.abc instead of typing; #6454

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

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

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

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

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
 

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

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