diff options
author | Marc Mueller <30130371+cdce8p@users.noreply.github.com> | 2023-04-23 23:53:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-23 23:53:59 +0200 |
commit | a91a8d60ccd5ca8e5f8e162d67b3b93444105235 (patch) | |
tree | 7087fd6ddbabfc81f99627f1122f8092bec977fc /astroid/interpreter | |
parent | e49bfaa2229e2ce27b7a212ad3ebe378dc17f613 (diff) | |
download | astroid-git-a91a8d60ccd5ca8e5f8e162d67b3b93444105235.tar.gz |
Drop support for Python 3.7 (#2137)
Diffstat (limited to 'astroid/interpreter')
-rw-r--r-- | astroid/interpreter/_import/spec.py | 7 | ||||
-rw-r--r-- | astroid/interpreter/objectmodel.py | 10 |
2 files changed, 3 insertions, 14 deletions
diff --git a/astroid/interpreter/_import/spec.py b/astroid/interpreter/_import/spec.py index f17ce51f..1630ca8a 100644 --- a/astroid/interpreter/_import/spec.py +++ b/astroid/interpreter/_import/spec.py @@ -17,18 +17,13 @@ import warnings import zipimport from collections.abc import Iterator, Sequence from pathlib import Path -from typing import Any, NamedTuple +from typing import Any, Literal, NamedTuple, Protocol from astroid.const import PY310_PLUS from astroid.modutils import EXT_LIB_DIRS from . import util -if sys.version_info >= (3, 8): - from typing import Literal, Protocol -else: - from typing_extensions import Literal, Protocol - # The MetaPathFinder protocol comes from typeshed, which says: # Intentionally omits one deprecated and one optional method of `importlib.abc.MetaPathFinder` diff --git a/astroid/interpreter/objectmodel.py b/astroid/interpreter/objectmodel.py index bd9e9f5b..12405684 100644 --- a/astroid/interpreter/objectmodel.py +++ b/astroid/interpreter/objectmodel.py @@ -26,10 +26,9 @@ from __future__ import annotations import itertools import os import pprint -import sys import types from functools import lru_cache -from typing import TYPE_CHECKING, Any +from typing import TYPE_CHECKING, Any, Literal import astroid from astroid import bases, nodes, util @@ -38,11 +37,6 @@ from astroid.exceptions import AttributeInferenceError, InferenceError, NoDefaul from astroid.manager import AstroidManager from astroid.nodes import node_classes -if sys.version_info >= (3, 8): - from typing import Literal -else: - from typing_extensions import Literal - if TYPE_CHECKING: from astroid.objects import Property @@ -115,7 +109,7 @@ class ObjectModel: def __contains__(self, name) -> bool: return name in self.attributes() - @lru_cache() # noqa + @lru_cache # noqa def attributes(self) -> list[str]: """Get the attributes which are exported by this object model.""" return [o[LEN_OF_IMPL_PREFIX:] for o in dir(self) if o.startswith(IMPL_PREFIX)] |