Fixes to typesystem, with tests

runtype/base_types.py

@@ -50,7 +50,8 @@ def __ge__(self, other):
 
     def __le__(self, other):
         if isinstance(other, Type):
-            return other is self
+            if other is self:   # Optimization
+                return True
 
         return NotImplemented
 
@@ -72,6 +73,12 @@ def __le__(self, other):
 
         return super().__le__(other)
 
+    def __ge__(self, other):
+        # XXX hack
+        if isinstance(other, AnyType):
+            return False
+        return NotImplemented
+
 
 class SumType(Type):
     """Implements a sum type, i.e. a disjoint union of a set of types.
@@ -170,6 +177,11 @@ class ContainerType(DataType):
     def __getitem__(self, other):
         return GenericType(self, other)
 
+    def __le__(self, other):
+        # XXX hack
+        if isinstance(other, AnyType):
+            return True
+        return super().__le__(other)
 
 class GenericType(ContainerType):
     """Implements a generic type. i.e. a container for items of a specific type.
@@ -214,6 +226,10 @@ def __le__(self, other):
         elif isinstance(other, DataType):
             return self.base <= other
 
+        elif isinstance(other, AnyType):
+            # HACK
+            return True
+
         return NotImplemented
 
     def __ge__(self, other):
@@ -223,6 +239,10 @@ def __ge__(self, other):
         elif isinstance(other, DataType):
             return self.base >= other
 
+        elif isinstance(other, AnyType):
+            # HACK
+            return False
+
         return NotImplemented
 
     def __hash__(self):

tests/test_basic.py

@@ -1035,9 +1035,17 @@ class Foo:
                 "d": {"a": {"baz": 2}}
                 }
 
-
-
-
+    def test_any(self):
+        assert is_subtype(int, Any)
+        assert not is_subtype(Any, int)
+        assert is_subtype(Any, Any)
+        assert is_subtype(Any, Union[Any, int])
+        assert is_subtype(Any, Union[Any, None])
+        assert is_subtype(Union[Any, int], Any)
+        assert is_subtype(Union[Any, None], Any)
+        assert is_subtype(Union[Any, None], Union[Any, None])
+        assert is_subtype(dict, Any, )
+        assert not is_subtype(Any, dict)
 
 if __name__ == '__main__':
     unittest.main()