Merge branch 'master' into feature/05-attempt-II

python/deps/untypy/untypy/impl/__init__.py

@@ -16,6 +16,7 @@
 from .protocol import ProtocolFactory
 from .sequence import SequenceFactory
 from .simple import SimpleFactory
+from .string_forward_refs import StringForwardRefFactory
 from .tuple import TupleFactory
 from .union import UnionFactory
 from ..error import Location, UntypyAttributeError
@@ -37,17 +38,20 @@
     GeneratorFactory(),
     IteratorFactory(),
     InterfaceFactory(),
+    StringForwardRefFactory(),  # resolve types passed as strings
     # must come last
     SimpleFactory()
 ]
 
 
 class DefaultCreationContext(CreationContext):
 
-    def __init__(self, typevars: Dict[TypeVar, Any], declared_location: Location, checkedpkgprefixes: List[str]):
+    def __init__(self, typevars: Dict[TypeVar, Any], declared_location: Location,
+                 checkedpkgprefixes: List[str], eval_context: Optional[Any] = None):
         self.typevars = typevars
         self.declared = declared_location
         self.checkedpkgprefixes = checkedpkgprefixes
+        self._eval_context = eval_context
 
     def declared_location(self) -> Location:
         return self.declared
@@ -75,7 +79,7 @@ def all_typevars(self) -> List[TypeVar]:
     def with_typevars(self, typevars: Dict[TypeVar, Any]) -> CreationContext:
         tv = self.typevars.copy()
         tv.update(typevars)
-        return DefaultCreationContext(tv, self.declared, self.checkedpkgprefixes)
+        return DefaultCreationContext(tv, self.declared, self.checkedpkgprefixes, self._eval_context)
 
     def should_be_inheritance_checked(self, annotation: type) -> bool:
         m = inspect.getmodule(annotation)
@@ -88,3 +92,6 @@ def should_be_inheritance_checked(self, annotation: type) -> bool:
                 return True
 
         return False
+
+    def eval_context(self):
+        return self._eval_context

python/deps/untypy/untypy/impl/string_forward_refs.py

@@ -0,0 +1,14 @@
+from typing import Any, Optional
+
+from untypy.interfaces import TypeChecker, TypeCheckerFactory, CreationContext
+
+
+class StringForwardRefFactory(TypeCheckerFactory):
+    def create_from(self, annotation: Any, ctx: CreationContext) -> Optional[TypeChecker]:
+        if type(annotation) is str:
+            eval_args = [annotation, globals()]
+            local = ctx.eval_context()
+            if local is not None:
+                eval_args.append(local)
+            annotation = eval(*eval_args)
+            return ctx.find_checker(annotation)

python/deps/untypy/untypy/interfaces.py

@@ -28,6 +28,9 @@ def with_typevars(self, typevars: dict[TypeVar, Any]) -> CreationContext:
     def should_be_inheritance_checked(self, annotation: type) -> bool:
         raise NotImplementedError
 
+    def eval_context(self):
+        raise NotImplementedError
+
 
 class ExecutionContext:
     def wrap(self, err: UntypyTypeError) -> UntypyTypeError:

python/deps/untypy/untypy/patching/__init__.py

@@ -37,7 +37,8 @@ def patch_class(clas: type, cfg: Config):
                 file="<not found>",
                 line_no=0,
                 line_span=1
-            ), checkedpkgprefixes=cfg.checkedprefixes)
+            ), checkedpkgprefixes=cfg.checkedprefixes,
+        )
 
     setattr(clas, '__patched', True)
 
@@ -55,7 +56,7 @@ def wrap_function(fn: FunctionType, cfg: Config) -> Callable:
         return TypedFunctionBuilder(fn, DefaultCreationContext(
             typevars=dict(),
             declared_location=WrappedFunction.find_location(fn),
-            checkedpkgprefixes=cfg.checkedprefixes)).build()
+            checkedpkgprefixes=cfg.checkedprefixes, eval_context=fn.__globals__)).build()
     else:
         return fn
 

python/fileTests

@@ -141,6 +141,7 @@ checkWithOutputAux yes 0 test-data/testForwardRef1.py
 checkWithOutputAux yes 1 test-data/testForwardRef2.py
 checkWithOutputAux yes 0 test-data/testForwardRef3.py
 checkWithOutputAux yes 1 test-data/testForwardRef4.py
+checkWithOutputAux yes 1 test-data/testForwardRef5.py
 checkWithOutputAux yes 1 test-data/testTypesReturn.py
 checkWithOutputAux yes 1 test-data/testMissingReturn.py
 checkWithOutputAux yes 1 test-data/testTypesSequence1.py

python/test-data/testForwardRef5.err

@@ -0,0 +1,12 @@
+Traceback (most recent call last):
+  File "test-data/testForwardRef5.py", line 23, in <module>
+    for car in garage.cars:
+WyppTypeError: got value of wrong type
+given:    'Not A Car'
+expected: value of type Car
+
+context: record constructor Garage(cars: list[Car]) -> Self
+                                              ^^^
+declared at: test-data/testForwardRef5.py:9
+caused by: test-data/testForwardRef5.py:23
+  | for car in garage.cars:

python/test-data/testForwardRef5.py

@@ -0,0 +1,24 @@
+# See https://github.com/skogsbaer/write-your-python-program/issues/62
+
+from wypp import *
+
+@record
+class Car:
+    color: str
+
+@record
+class Garage:
+    cars: list['Car']
+
+class CarManager:
+    def store(self, car : set['Car'], garage :'Garage') -> 'CarManager':
+        return self
+
+garage = Garage(cars=[Car(color='red'), Car(color='blue')])
+for car in garage.cars:
+    pass
+
+# trigger error
+garage = Garage(cars=[Car(color='red'), "Not A Car"])
+for car in garage.cars:
+    pass