ovld 0.4.2__py3-none-any.whl → 0.4.3__py3-none-any.whl

ovld/__init__.py

@@ -15,6 +15,11 @@ from .dependent import (
     ParametrizedDependentType,
     dependent_check,
 )
+from .mro import (
+    TypeRelationship,
+    subclasscheck,
+    typeorder,
+)
 from .recode import call_next, recurse
 from .typemap import (
     MultiTypeMap,
@@ -66,6 +71,9 @@ __all__ = [
     "Intersection",
     "StrictSubclass",
     "class_check",
+    "subclasscheck",
+    "typeorder",
+    "TypeRelationship",
     "parametrized_class_check",
     "keyword_decorator",
     "call_next",

ovld/dependent.py

@@ -7,7 +7,6 @@ from typing import TYPE_CHECKING, Any, Mapping, TypeVar, Union
 from .types import (
     Intersection,
     Order,
-    TypeRelationship,
     normalize_type,
     subclasscheck,
     typeorder,
@@ -67,26 +66,34 @@ class DependentType:
     def codegen(self):
         return CodeGen("{this}.check({arg})", {"this": self})
 
-    def __typeorder__(self, other):
+    def __type_order__(self, other):
         if isinstance(other, DependentType):
             order = typeorder(self.bound, other.bound)
             if order is Order.SAME:
                 # It isn't fully deterministic which of these will be called
                 # because of set ordering between the types we compare
                 if self < other:  # pragma: no cover
-                    return TypeRelationship(Order.LESS, matches=False)
+                    return Order.LESS
                 elif other < self:  # pragma: no cover
-                    return TypeRelationship(Order.MORE, matches=False)
+                    return Order.MORE
                 else:
-                    return TypeRelationship(Order.NONE, matches=False)
+                    return Order.NONE
             else:  # pragma: no cover
-                return TypeRelationship(order, matches=False)
-        elif (matches := subclasscheck(other, self.bound)) or subclasscheck(
+                return order
+        elif subclasscheck(other, self.bound) or subclasscheck(
             self.bound, other
         ):
-            return TypeRelationship(Order.LESS, matches=matches)
+            return Order.LESS
         else:
-            return TypeRelationship(Order.NONE, matches=False)
+            return Order.NONE
+
+    def __is_supertype__(self, other):
+        if isinstance(other, DependentType):
+            return False
+        elif subclasscheck(other, self.bound):
+            return True
+        else:
+            return False
 
     def __lt__(self, other):
         return False

ovld/mro.py

@@ -22,7 +22,8 @@ class Order(Enum):
 @dataclass
 class TypeRelationship:
     order: Order
-    matches: bool = None
+    supertype: bool = NotImplemented
+    subtype: bool = NotImplemented
 
 
 def _issubclass(t1, t2):
@@ -48,19 +49,16 @@ def typeorder(t1, t2):
     if t1 == t2:
         return Order.SAME
 
-    t1 = getattr(t1, "__proxy_for__", t1)
-    t2 = getattr(t2, "__proxy_for__", t2)
-
     if (
-        hasattr(t1, "__typeorder__")
-        and (result := t1.__typeorder__(t2)) is not NotImplemented
+        hasattr(t1, "__type_order__")
+        and (result := t1.__type_order__(t2)) is not NotImplemented
     ):
-        return result.order
+        return result
     elif (
-        hasattr(t2, "__typeorder__")
-        and (result := t2.__typeorder__(t1)) is not NotImplemented
+        hasattr(t2, "__type_order__")
+        and (result := t2.__type_order__(t1)) is not NotImplemented
     ):
-        return result.order.opposite()
+        return result.opposite()
 
     o1 = getattr(t1, "__origin__", None)
     o2 = getattr(t2, "__origin__", None)
@@ -135,14 +133,17 @@ def subclasscheck(t1, t2):
     if t1 == t2:
         return True
 
-    t1 = getattr(t1, "__proxy_for__", t1)
-    t2 = getattr(t2, "__proxy_for__", t2)
+    if (
+        hasattr(t2, "__is_supertype__")
+        and (result := t2.__is_supertype__(t1)) is not NotImplemented
+    ):
+        return result
 
     if (
-        hasattr(t2, "__typeorder__")
-        and (result := t2.__typeorder__(t1)) is not NotImplemented
+        hasattr(t1, "__is_subtype__")
+        and (result := t1.__is_subtype__(t2)) is not NotImplemented
     ):
-        return result.matches
+        return result
 
     o1 = getattr(t1, "__origin__", None)
     o2 = getattr(t2, "__origin__", None)

ovld/types.py

@@ -61,19 +61,31 @@ class MetaMC(type):
     def __init__(cls, name, order):
         pass
 
-    def __typeorder__(cls, other):
-        order = cls.order(other)
-        if isinstance(order, bool):
-            return NotImplemented
+    def __type_order__(cls, other):
+        results = cls.order(other)
+        if isinstance(results, TypeRelationship):
+            return results.order
         else:
-            return order
+            return NotImplemented
+
+    def __is_supertype__(cls, other):
+        results = cls.order(other)
+        if isinstance(results, bool):
+            return results
+        elif isinstance(results, TypeRelationship):
+            return results.supertype
+        else:  # pragma: no cover
+            return NotImplemented
+
+    def __is_subtype__(cls, other):
+        results = cls.order(other)
+        if isinstance(results, TypeRelationship):
+            return results.subtype
+        else:  # pragma: no cover
+            return NotImplemented
 
     def __subclasscheck__(cls, sub):
-        result = cls.order(sub)
-        if isinstance(result, TypeRelationship):
-            return result.order in (Order.MORE, Order.SAME)
-        else:
-            return result
+        return cls.__is_supertype__(sub)
 
 
 def class_check(condition):
@@ -164,7 +176,7 @@ def Exactly(cls, base_cls):
     """Match the class but not its subclasses."""
     return TypeRelationship(
         order=Order.LESS if cls is base_cls else typeorder(base_cls, cls),
-        matches=cls is base_cls,
+        supertype=cls is base_cls,
     )
 
 
@@ -184,11 +196,11 @@ def Intersection(cls, *classes):
     matches = all(subclasscheck(cls, t) for t in classes)
     compare = [x for t in classes if (x := typeorder(t, cls)) is not Order.NONE]
     if not compare:
-        return TypeRelationship(Order.NONE, matches=matches)
+        return TypeRelationship(Order.NONE, supertype=matches)
     elif any(x is Order.LESS or x is Order.SAME for x in compare):
-        return TypeRelationship(Order.LESS, matches=matches)
+        return TypeRelationship(Order.LESS, supertype=matches)
     else:
-        return TypeRelationship(Order.MORE, matches=matches)
+        return TypeRelationship(Order.MORE, supertype=matches)
 
 
 @parametrized_class_check

ovld/version.py

@@ -1 +1 @@
-version = "0.4.2"
+version = "0.4.3"

{ovld-0.4.2.dist-info → ovld-0.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ovld
-Version: 0.4.2
+Version: 0.4.3
 Summary: Overloading Python functions
 Project-URL: Homepage, https://ovld.readthedocs.io/en/latest/
 Project-URL: Documentation, https://ovld.readthedocs.io/en/latest/

ovld-0.4.3.dist-info/RECORD

@@ -0,0 +1,13 @@
+ovld/__init__.py,sha256=_MJizMQ-Ise8c53GCsC7f-MOhp-qcUd0bpvu8LUFp8M,1444
+ovld/core.py,sha256=glexOiRU0ajoxFAQN6d69ToL6_cPvyv05Z7LEHqrJj8,25701
+ovld/dependent.py,sha256=HZbn2uU1uby9D-5qmDSjwdUpIJPdBXYrCW82lpTrBS4,7289
+ovld/mro.py,sha256=eNU8rMG3hVOA1h7cd2lo4mmXQQbAGI5ISERllOO8_Js,5598
+ovld/recode.py,sha256=zxhyotuc73qzuN4NEN_rKxaqoA0SOH7KFtE2l_CRBFs,17963
+ovld/typemap.py,sha256=gw8XvB-N_15Dr0-am0v17x1seNjYK5AxvUT9L36mWic,13630
+ovld/types.py,sha256=zR5_W3iFZb5LfktjrGfCMa1-eAwlF-AyBeTwAX3JayU,6795
+ovld/utils.py,sha256=V6Y8oZ6ojq8JaODL1rMZbU5L9QG0YSqHNYmpIFiwy3M,1294
+ovld/version.py,sha256=qGkDKQTrLXZ0o-aafthub4OFvdwOI_7GN29zXzZj8zg,18
+ovld-0.4.3.dist-info/METADATA,sha256=JxkPMmizv16TxE_gBQKClp29o8d_10FgFYsPVQ2Tvf0,7713
+ovld-0.4.3.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+ovld-0.4.3.dist-info/licenses/LICENSE,sha256=cSwNTIzd1cbI89xt3PeZZYJP2y3j8Zus4bXgo4svpX8,1066
+ovld-0.4.3.dist-info/RECORD,,

ovld-0.4.2.dist-info/RECORD

@@ -1,13 +0,0 @@
-ovld/__init__.py,sha256=Vp9wbIy_opFmJx-vCcToQcIP3cWFIvgbfYHITyiwPLs,1305
-ovld/core.py,sha256=glexOiRU0ajoxFAQN6d69ToL6_cPvyv05Z7LEHqrJj8,25701
-ovld/dependent.py,sha256=QITsWu2uCwqkHE0tunETy8Jqwc272uoG5YM0I5yy0m4,7303
-ovld/mro.py,sha256=rS0pCLLWwLUI0NdthpoJSrdvWR4-XgRfx1pLAvJde14,5586
-ovld/recode.py,sha256=zxhyotuc73qzuN4NEN_rKxaqoA0SOH7KFtE2l_CRBFs,17963
-ovld/typemap.py,sha256=gw8XvB-N_15Dr0-am0v17x1seNjYK5AxvUT9L36mWic,13630
-ovld/types.py,sha256=Zeb7xhHbL4T7qIRHI-I_cjG61UIWrfZv_EwjwqhB-rY,6381
-ovld/utils.py,sha256=V6Y8oZ6ojq8JaODL1rMZbU5L9QG0YSqHNYmpIFiwy3M,1294
-ovld/version.py,sha256=OHlqRD04Kvw_CFYmiIVx7UuOJRTQKtAx1Bl4rkUYHJE,18
-ovld-0.4.2.dist-info/METADATA,sha256=fV3vxTKRAjCUkRVNmzTW14VajGSl7P0b9NnG06cjUJk,7713
-ovld-0.4.2.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-ovld-0.4.2.dist-info/licenses/LICENSE,sha256=cSwNTIzd1cbI89xt3PeZZYJP2y3j8Zus4bXgo4svpX8,1066
-ovld-0.4.2.dist-info/RECORD,,