Merge pull request #746 from bartsanchez/bart/fix-ruff-rule-up035

feat: fix Ruff rule UP035 (deprecated-import)

Author: boriel

pyproject.toml

@@ -113,6 +113,5 @@ ignore = [
     "UP030",
     "UP031",
     "UP032",
-    "UP035",
     "UP038",
 ]

src/api/config.py

@@ -13,8 +13,8 @@
 import enum
 import os
 import sys
+from collections.abc import Callable
 from enum import Enum
-from typing import Callable
 
 from src.api import errmsg, global_, options
 from src.api.options import ANYTYPE, Action

src/api/decorator.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from typing import Callable
+from collections.abc import Callable
 
 
 class classproperty:

src/api/errmsg.py

@@ -10,8 +10,8 @@
 # ----------------------------------------------------------------------
 
 import sys
+from collections.abc import Callable
 from functools import wraps
-from typing import Callable
 
 from src.api import config, global_
 from src.api.constants import CLASS

src/api/optimize.py

@@ -1,7 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import symtable
-from typing import Any, Generator, NamedTuple
+from collections.abc import Generator
+from typing import Any, NamedTuple
 
 import src.api.check as chk
 import src.api.global_ as gl

src/api/utils.py

@@ -5,8 +5,9 @@
 import os
 import shelve
 import signal
+from collections.abc import Callable, Iterable
 from functools import wraps
-from typing import IO, Any, Callable, Iterable, TypeVar
+from typing import IO, Any, TypeVar
 
 from src.api import constants, errmsg, global_
 

src/arch/z80/backend/icinfo.py

@@ -1,5 +1,5 @@
+from collections.abc import Callable
 from dataclasses import dataclass
-from typing import Callable
 
 from .exception import throw_invalid_quad_params
 from .quad import Quad

src/arch/z80/optimizer/basicblock.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Final, Iterable, Iterator, Sequence
+from collections.abc import Iterable, Iterator, Sequence
+from typing import TYPE_CHECKING, Final
 
 from src.api import errmsg
 from src.api.config import OPTIONS

src/arch/z80/optimizer/helpers.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-from collections.abc import Mapping
-from typing import Any, Final, Iterable, TypeVar, cast
+from collections.abc import Iterable, Mapping
+from typing import Any, Final, TypeVar, cast
 
 from . import patterns
 

src/arch/z80/peephole/engine.py

@@ -3,7 +3,8 @@
 
 import os
 import sys
-from typing import Iterable, NamedTuple
+from collections.abc import Iterable
+from typing import NamedTuple
 
 from src.api import debug, errmsg
 from src.arch.z80.peephole import parser