Merge pull request #427 from TTsangSC/scoping-policy-typing-fix

FIX: typing of `ScopingPolicy` members

Author: Erotemic

CHANGELOG.rst

@@ -7,6 +7,9 @@ Changes
   ``sys.modules['__main__']`` namespace to avoid issues w/e.g. pickling
   (#423)
 * CHANGE: Drop support for Python 3.8 and Python 3.9
+* FIX: ``ScopingPolicy`` members now type-check properly as instances
+  thereof -- at least on Python versions (3.11+) where ``enum.StrEnum``
+  is available (#427)
 * FIX: Bytecodes of profiled functions now always labeled to prevent
   confusion with non-profiled "twins" (#425)
 

line_profiler/line_profiler.py

@@ -600,15 +600,9 @@ def _add_namespace(
         namespace: type | types.ModuleType,
         *,
         seen: set[int] | None = None,
-        func_scoping_policy: ScopingPolicy = cast(
-            ScopingPolicy, ScopingPolicy.NONE
-        ),
-        class_scoping_policy: ScopingPolicy = cast(
-            ScopingPolicy, ScopingPolicy.NONE
-        ),
-        module_scoping_policy: ScopingPolicy = cast(
-            ScopingPolicy, ScopingPolicy.NONE
-        ),
+        func_scoping_policy: ScopingPolicy = ScopingPolicy.NONE,
+        class_scoping_policy: ScopingPolicy = ScopingPolicy.NONE,
+        module_scoping_policy: ScopingPolicy = ScopingPolicy.NONE,
         wrap: bool = False,
         name: str | None = None,
     ) -> int:

line_profiler/line_profiler_utils.py

@@ -46,7 +46,14 @@ def __str__(self) -> str:
         return self.value
 
 
-class StringEnum(getattr(enum, 'StrEnum', _StrEnumBase)):  # type: ignore[misc]
+try:
+    from enum import StrEnum as _StrEnum
+except ImportError:
+    if not typing.TYPE_CHECKING:  # Don't confuse the typechecker
+        _StrEnum = _StrEnumBase
+
+
+class StringEnum(_StrEnum):
     """
     Convenience wrapper around :py:class:`enum.StrEnum`.