Attempt to fix tests

erezsh · Oct 9, 2022 · 72dfb05 · 72dfb05
1 parent b0c8358
commit 72dfb05
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/runtype/utils.py b/runtype/utils.py
@@ -1,15 +1,23 @@
 import inspect
+import sys
 
-try: 
-    from typing import ForwardRef
-except ImportError: 
+if sys.version_info < (3, 7):
     # python 3.6 
     from typing import _ForwardRef as ForwardRef
+    _orig_eval = ForwardRef._eval_type
+elif sys.version_info < (3, 9):
+    from typing import ForwardRef
+    _orig_eval = ForwardRef._evaluate
+else:
+    from typing import ForwardRef
+
+if sys.version_info < (3, 9):
     def _evaluate(self, g, l, _):
-        return self._eval_type(g, l)
+        return _orig_eval(self, g, l)
     ForwardRef._evaluate = _evaluate
 
 
+
 def get_func_signatures(typesystem, f):
     sig = inspect.signature(f)
     typesigs = []