Various fixes to pytypes + typesystem

runtype/base_types.py

@@ -49,9 +49,11 @@ def __ge__(self, other):
         return NotImplemented
 
     def __le__(self, other):
-        if isinstance(other, Type):
-            if other is self:   # Optimization
-                return True
+        if other is self:   # Optimization
+            return True
+        elif isinstance(other, (type, Type)):
+            if not isinstance(other, SumType):
+                return False
 
         return NotImplemented
 
@@ -74,9 +76,6 @@ def __le__(self, other):
         return super().__le__(other)
 
     def __ge__(self, other):
-        # XXX hack
-        if isinstance(other, AnyType):
-            return False
         return NotImplemented
 
 
@@ -177,12 +176,6 @@ 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.
 
@@ -226,10 +219,6 @@ 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):
@@ -239,10 +228,6 @@ def __ge__(self, other):
         elif isinstance(other, DataType):
             return self.base >= other
 
-        elif isinstance(other, AnyType):
-            # HACK
-            return False
-
         return NotImplemented
 
     def __hash__(self):

runtype/pytypes.py

@@ -333,6 +333,8 @@ def validate_instance(self, obj, sampler=None):
 Literal = OneOf
 Type = TypeType(PythonDataType(type))
 
+class _Bool(PythonDataType):
+    pass
 
 class _Number(PythonDataType):
     def __call__(self, min=None, max=None):
@@ -427,6 +429,7 @@ def cast_from(self, obj):
 
 
 String = _String(str)
+Bool = _Bool(bool)
 Int = _Int(int)
 Float = _Float(float)
 NoneType =  _NoneType()
@@ -443,6 +446,8 @@ def cast_from(self, obj):
     frozenset: FrozenSet,
     dict: Dict,
     tuple: Tuple,
+    bool: Bool,
+    None: NoneType,
     int: Int,
     str: String,
     float: Float,