Simplify cached_property import guards

Author: DanielNoord

astroid/mixins.py

@@ -14,7 +14,7 @@
 if TYPE_CHECKING:
     from astroid import nodes
 
-if sys.version_info >= (3, 8) or TYPE_CHECKING:
+if sys.version_info >= (3, 8):
     from functools import cached_property
 else:
     from astroid.decorators import cachedproperty as cached_property

astroid/nodes/node_classes.py

@@ -46,8 +46,7 @@
     from astroid import nodes
     from astroid.nodes import LocalsDictNodeNG
 
-if sys.version_info >= (3, 8) or TYPE_CHECKING:
-    # pylint: disable-next=ungrouped-imports
+if sys.version_info >= (3, 8):
     from functools import cached_property
 else:
     from astroid.decorators import cachedproperty as cached_property

astroid/nodes/node_ng.py

@@ -43,11 +43,9 @@
 else:
     from typing_extensions import Literal
 
-if sys.version_info >= (3, 8) or TYPE_CHECKING:
-    # pylint: disable-next=ungrouped-imports
+if sys.version_info >= (3, 8):
     from functools import cached_property
 else:
-    # pylint: disable-next=ungrouped-imports
     from astroid.decorators import cachedproperty as cached_property
 
 # Types for 'NodeNG.nodes_of_class()'

astroid/nodes/scoped_nodes/scoped_nodes.py

@@ -13,7 +13,7 @@
 import sys
 import typing
 import warnings
-from typing import TYPE_CHECKING, Dict, List, Optional, Set, TypeVar, Union, overload
+from typing import Dict, List, Optional, Set, TypeVar, Union, overload
 
 from astroid import bases
 from astroid import decorators as decorators_mod
@@ -51,14 +51,11 @@
 
 
 if sys.version_info >= (3, 8):
+    from functools import cached_property
     from typing import Literal
 else:
     from typing_extensions import Literal
 
-if sys.version_info >= (3, 8) or TYPE_CHECKING:
-    from functools import cached_property
-else:
-    # pylint: disable-next=ungrouped-imports
     from astroid.decorators import cachedproperty as cached_property
 
 

astroid/objects.py

@@ -12,7 +12,6 @@
 """
 
 import sys
-from typing import TYPE_CHECKING
 
 from astroid import bases, decorators, util
 from astroid.exceptions import (
@@ -26,7 +25,7 @@
 
 objectmodel = util.lazy_import("interpreter.objectmodel")
 
-if sys.version_info >= (3, 8) or TYPE_CHECKING:
+if sys.version_info >= (3, 8):
     from functools import cached_property
 else:
     from astroid.decorators import cachedproperty as cached_property