Changed _inside_typing to clean _module_in_stack(module)!

generalimport/dunders.py

@@ -1,14 +1,14 @@
-from typing import Type, List
+import typing
 
-from generalimport.generalimport_bottom import _inside_typing
+from generalimport.generalimport_bottom import _module_in_stack
 from generalimport.import_catcher import ErrorPars
 
 
 class DynamicDunder:
  """ Inherit to define a dynamic dunder.
  All subclasses' triggers are tested for truthy before a MissingOptionalDependency is raised.
  Returns result() of first triggered dynamic dunder. """
- subclasses: List[Type["DynamicDunder"]] = []
+ subclasses: typing.List[typing.Type["DynamicDunder"]] = []
 
  def __init_subclass__(cls, **kwargs):
  cls.subclasses.append(cls)
@@ -75,7 +75,7 @@ def result(self): ...
 
 class DynamicEQ(DynamicDunder):
  def trigger(self):
- return _inside_typing() and self.error_pars.caller == "__eq__" and bool(self.error_pars.args)
+ return _module_in_stack(module=typing) and self.error_pars.caller == "__eq__" and bool(self.error_pars.args)
 
  def result(self):
  other = self.error_pars.args[0]
@@ -84,7 +84,7 @@ def result(self):
 
 class DynamicHash(DynamicDunder):
  def trigger(self):
- return _inside_typing() and self.error_pars.caller == "__hash__"
+ return _module_in_stack(module=typing) and self.error_pars.caller == "__hash__"
 
  def result(self):
  return id(self)

generalimport/generalimport_bottom.py

@@ -1,6 +1,7 @@
 import importlib
 import pkgutil
 import sys
+from inspect import getmodule
 from pathlib import Path
 
 
@@ -81,11 +82,10 @@ def _get_previous_frame_filename(depth):
  return filename
  frame = frame.f_back
 
-def _inside_typing():
+def _module_in_stack(module):
  frame = sys._getframe(0)
  while frame:
- filename = frame.f_code.co_filename.replace("\\", "/").lower()
- if r"typing.py" in filename:
+ if getmodule(frame) is module:
  return True
  frame = frame.f_back
  return False