diff --git a/pyocd/core/memory_interface.py b/pyocd/core/memory_interface.py index 9e1e0f87..dff8128d 100644 --- a/pyocd/core/memory_interface.py +++ b/pyocd/core/memory_interface.py @@ -15,8 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from typing import (Callable, Sequence, Union, cast, overload) -from typing_extensions import Literal +from typing import (Callable, Sequence, Union, cast, overload, Literal) from ..utility import conversion diff --git a/pyocd/core/memory_map.py b/pyocd/core/memory_map.py index 7bc4a225..0f9f5853 100644 --- a/pyocd/core/memory_map.py +++ b/pyocd/core/memory_map.py @@ -20,8 +20,7 @@ import collections.abc import copy from functools import total_ordering from typing import (Any, Callable, Dict, Iterable, Iterator, List, Optional, TYPE_CHECKING, - Sequence, Tuple, Type, Union) -from typing_extensions import Self + Sequence, Tuple, Type, Union, Self) from ..utility.strings import uniquify_name diff --git a/pyocd/core/plugin.py b/pyocd/core/plugin.py index 7408e4a6..8eb0fd7d 100644 --- a/pyocd/core/plugin.py +++ b/pyocd/core/plugin.py @@ -16,7 +16,7 @@ # limitations under the License. import logging -from importlib_metadata import entry_points +from importlib.metadata import entry_points from typing import ( Any, Dict, diff --git a/pyocd/core/session.py b/pyocd/core/session.py index 4618be9b..0a1c7c65 100644 --- a/pyocd/core/session.py +++ b/pyocd/core/session.py @@ -24,7 +24,7 @@ from pathlib import Path import weakref from inspect import (getfullargspec, signature) from types import SimpleNamespace -from typing import (Any, Callable, Generator, Sequence, Union, cast, Dict, List, Mapping, Optional, TYPE_CHECKING) +from typing import (Any, Callable, Generator, Sequence, Union, cast, Dict, List, Mapping, Optional, TYPE_CHECKING, Self) from . import exceptions from .options_manager import OptionsManager diff --git a/pyocd/core/soc_target.py b/pyocd/core/soc_target.py index 8aad9031..7751e420 100644 --- a/pyocd/core/soc_target.py +++ b/pyocd/core/soc_target.py @@ -16,8 +16,7 @@ # limitations under the License. import logging -from typing import (Callable, Dict, List, Optional, overload, Sequence, Union, TYPE_CHECKING) -from typing_extensions import Literal +from typing import (Callable, Dict, List, Optional, overload, Sequence, Union, TYPE_CHECKING, Literal) from .target import (Target, TargetGraphNode) from .core_target import CoreTarget diff --git a/pyocd/coresight/ap.py b/pyocd/coresight/ap.py index 8a37ef06..1140331c 100644 --- a/pyocd/coresight/ap.py +++ b/pyocd/coresight/ap.py @@ -19,8 +19,8 @@ import logging from contextlib import contextmanager from functools import total_ordering from enum import Enum -from typing import (Any, Callable, Dict, Generator, Optional, TYPE_CHECKING, Sequence, Set, Tuple, Type, Union, overload) -from typing_extensions import Literal +from typing import (Any, Callable, Dict, Generator, Optional, TYPE_CHECKING, Sequence, Set, Tuple, Type, Union, + overload, Literal) from ..core import (exceptions, memory_interface) from ..core.target import Target diff --git a/pyocd/coresight/cortex_m.py b/pyocd/coresight/cortex_m.py index f779235c..6699ec68 100644 --- a/pyocd/coresight/cortex_m.py +++ b/pyocd/coresight/cortex_m.py @@ -17,8 +17,7 @@ import logging from time import sleep -from typing import (Any, Callable, List, Optional, Set, overload, Sequence, TYPE_CHECKING, Union, cast) -from typing_extensions import Literal +from typing import (Any, Callable, List, Optional, Set, overload, Sequence, TYPE_CHECKING, Union, cast, Literal) from ..core.target import Target from ..core.core_target import CoreTarget diff --git a/pyocd/coresight/dap.py b/pyocd/coresight/dap.py index 4e86f6b7..46c56bdb 100644 --- a/pyocd/coresight/dap.py +++ b/pyocd/coresight/dap.py @@ -19,8 +19,7 @@ import logging from enum import Enum -from typing import (Callable, Dict, List, NamedTuple, Optional, Sequence, Tuple, TYPE_CHECKING, Union, overload) -from typing_extensions import Literal +from typing import (Callable, Dict, List, NamedTuple, Optional, Sequence, Tuple, TYPE_CHECKING, Union, overload, Literal) from ..core import (exceptions, memory_interface) from ..core.target import Target diff --git a/pyocd/debug/semihost.py b/pyocd/debug/semihost.py index 998d3ae7..5ec8e01f 100644 --- a/pyocd/debug/semihost.py +++ b/pyocd/debug/semihost.py @@ -25,8 +25,7 @@ import time import datetime import pathlib from enum import (Enum, IntEnum) -from typing import (IO, TYPE_CHECKING, Callable, Dict, List, Optional, Tuple, Union, cast, overload) -from typing_extensions import Literal +from typing import (IO, TYPE_CHECKING, Callable, Dict, List, Optional, Tuple, Union, cast, overload, Literal) from ..coresight.cortex_m import CortexM from ..core import (exceptions, session) diff --git a/pyocd/debug/sequences/sequences.py b/pyocd/debug/sequences/sequences.py index f4b78110..5a4cd012 100644 --- a/pyocd/debug/sequences/sequences.py +++ b/pyocd/debug/sequences/sequences.py @@ -28,8 +28,7 @@ from enum import Enum from inspect import signature from lark.lexer import Token as LarkToken from lark.tree import Tree as LarkTree -from typing import (Any, Iterator, cast, List, Optional, Union, TYPE_CHECKING) -from typing_extensions import Self +from typing import (Any, Iterator, cast, List, Optional, Union, TYPE_CHECKING, Self) from ...core import exceptions from ...coresight.ap import (APv1Address, APv2Address) diff --git a/pyocd/debug/svd/loader.py b/pyocd/debug/svd/loader.py index ee58f1e8..89bf2ad0 100644 --- a/pyocd/debug/svd/loader.py +++ b/pyocd/debug/svd/loader.py @@ -17,7 +17,7 @@ import threading import logging -import importlib_resources +import importlib.resources as importlib_resources import zipfile from .parser import SVDParser diff --git a/pyocd/probe/cmsis_dap_probe.py b/pyocd/probe/cmsis_dap_probe.py index 42cbe46f..a782a369 100644 --- a/pyocd/probe/cmsis_dap_probe.py +++ b/pyocd/probe/cmsis_dap_probe.py @@ -17,8 +17,7 @@ from time import sleep import logging -from typing import (Callable, Collection, Dict, List, Optional, overload, Sequence, Set, TYPE_CHECKING, Tuple, Union) -from typing_extensions import (Literal, Protocol) +from typing import (Callable, Collection, Dict, List, Optional, overload, Sequence, Set, TYPE_CHECKING, Tuple, Union, Literal, Protocol) from .debug_probe import DebugProbe from ..core import exceptions diff --git a/pyocd/probe/debug_probe.py b/pyocd/probe/debug_probe.py index c478de2f..902022de 100644 --- a/pyocd/probe/debug_probe.py +++ b/pyocd/probe/debug_probe.py @@ -17,8 +17,7 @@ from enum import (Enum, IntFlag) import threading -from typing import (Callable, Collection, Optional, overload, Sequence, Set, TYPE_CHECKING, Tuple, Union) -from typing_extensions import Literal +from typing import (Callable, Collection, Optional, overload, Sequence, Set, TYPE_CHECKING, Tuple, Union, Literal) if TYPE_CHECKING: from ..core.session import Session diff --git a/pyocd/tools/lists.py b/pyocd/tools/lists.py index 743f4dbc..3cb57ef2 100644 --- a/pyocd/tools/lists.py +++ b/pyocd/tools/lists.py @@ -16,7 +16,7 @@ # limitations under the License. import os -from importlib_metadata import entry_points +from importlib.metadata import entry_points from .. import __version__ from ..core.session import Session