ovld 0.4.0__py3-none-any.whl → 0.4.1__py3-none-any.whl

ovld/__init__.py

@@ -70,4 +70,5 @@ __all__ = [
     "keyword_decorator",
     "call_next",
     "recurse",
+    "__version__",
 ]

ovld/core.py

@@ -20,12 +20,6 @@ from .typemap import MultiTypeMap, is_type_of_type
 from .types import normalize_type
 from .utils import UsageError, keyword_decorator
 
-try:
-    from types import UnionType
-except ImportError:  # pragma: no cover
-    UnionType = None
-
-
 _current_id = itertools.count()
 
 

ovld/mro.py

@@ -25,6 +25,16 @@ class TypeRelationship:
     matches: bool = None
 
 
+def _issubclass(t1, t2):
+    try:
+        return issubclass(t1, t2)
+    except TypeError:
+        try:
+            return isinstance(t1, t2)
+        except TypeError:  # pragma: no cover
+            return False
+
+
 def typeorder(t1, t2):
     """Order relation between two types.
 
@@ -56,6 +66,8 @@ def typeorder(t1, t2):
     o2 = getattr(t2, "__origin__", None)
 
     if o2 is typing.Union:
+        if t1 is typing.Union:
+            return Order.MORE
         compare = [
             x for t in t2.__args__ if (x := typeorder(t1, t)) is not Order.NONE
         ]
@@ -105,8 +117,8 @@ def typeorder(t1, t2):
             # Not sure when t1 != t2 and that happens
             return Order.SAME
 
-    sx = issubclass(t1, t2)
-    sy = issubclass(t2, t1)
+    sx = _issubclass(t1, t2)
+    sy = _issubclass(t2, t1)
     if sx and sy:  # pragma: no cover
         # Not sure when t1 != t2 and that happens
         return Order.SAME
@@ -136,14 +148,23 @@ def subclasscheck(t1, t2):
     o2 = getattr(t2, "__origin__", None)
 
     if o2 is typing.Union:
-        return any(subclasscheck(t1, t) for t in t2.__args__)
+        return t1 is typing.Union or any(
+            subclasscheck(t1, t) for t in t2.__args__
+        )
     elif o1 is typing.Union:
-        return all(subclasscheck(t, t2) for t in t1.__args__)
+        return t2 is typing.Union or all(
+            subclasscheck(t, t2) for t in t1.__args__
+        )
+
+    if not isinstance(o1, type):
+        o1 = None
+    if not isinstance(o2, type):
+        o2 = None
 
     if o1 or o2:
         o1 = o1 or t1
         o2 = o2 or t2
-        if issubclass(o1, o2):
+        if _issubclass(o1, o2):
             if o2 is t2:  # pragma: no cover
                 return True
             else:
@@ -157,7 +178,7 @@ def subclasscheck(t1, t2):
         else:
             return False
     else:
-        return issubclass(t1, t2)
+        return _issubclass(t1, t2)
 
 
 def sort_types(cls, avail):

ovld/version.py

@@ -1 +1 @@
-version = "0.4.0"
+version = "0.4.1"

{ovld-0.4.0.dist-info → ovld-0.4.1.dist-info}/METADATA

@@ -1,7 +1,10 @@
 Metadata-Version: 2.3
 Name: ovld
-Version: 0.4.0
+Version: 0.4.1
 Summary: Overloading Python functions
+Project-URL: Homepage, https://ovld.readthedocs.io/en/latest/
+Project-URL: Documentation, https://ovld.readthedocs.io/en/latest/
+Project-URL: Repository, https://github.com/breuleux/ovld
 Author-email: Olivier Breuleux <breuleux@gmail.com>
 License-Expression: MIT
 License-File: LICENSE

ovld-0.4.1.dist-info/RECORD

@@ -0,0 +1,13 @@
+ovld/__init__.py,sha256=Vp9wbIy_opFmJx-vCcToQcIP3cWFIvgbfYHITyiwPLs,1305
+ovld/core.py,sha256=S6YSbZk5ajKvdVqn5NyuduDAU_moBylZGmpNskQE7XI,25397
+ovld/dependent.py,sha256=QITsWu2uCwqkHE0tunETy8Jqwc272uoG5YM0I5yy0m4,7303
+ovld/mro.py,sha256=rS0pCLLWwLUI0NdthpoJSrdvWR4-XgRfx1pLAvJde14,5586
+ovld/recode.py,sha256=Vc97Nv1j2GWuitLOzIuIhpscZ4gaOJQP3hLNp8SGTQ8,17890
+ovld/typemap.py,sha256=U_BmXtts1oYVa6gI3cgGHMX5kFcCJY_mt_cjWvDo3jQ,12979
+ovld/types.py,sha256=Zeb7xhHbL4T7qIRHI-I_cjG61UIWrfZv_EwjwqhB-rY,6381
+ovld/utils.py,sha256=V6Y8oZ6ojq8JaODL1rMZbU5L9QG0YSqHNYmpIFiwy3M,1294
+ovld/version.py,sha256=FBeN5tbWV0BpBmjJ3d3pzaNRlEg_Blp421Tbg8X3cAI,18
+ovld-0.4.1.dist-info/METADATA,sha256=OOhqZjiT-T6jb-c0iATIElVxfZbZ62qDcuJQcxvHMQM,7713
+ovld-0.4.1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+ovld-0.4.1.dist-info/licenses/LICENSE,sha256=cSwNTIzd1cbI89xt3PeZZYJP2y3j8Zus4bXgo4svpX8,1066
+ovld-0.4.1.dist-info/RECORD,,

ovld-0.4.0.dist-info/RECORD

@@ -1,13 +0,0 @@
-ovld/__init__.py,sha256=nF8ymgr8dSL2WvDpOXVxqDuEGUywbkiCGr4ICumMD8U,1286
-ovld/core.py,sha256=siahCDuw78n02-2g7TGI1GerrGvPxT0zPouN6Z30Z-g,25497
-ovld/dependent.py,sha256=QITsWu2uCwqkHE0tunETy8Jqwc272uoG5YM0I5yy0m4,7303
-ovld/mro.py,sha256=dNuVW5DIOT8TJtY4vEpxT4q3R8fQxJ8UyDQSD9oFYYo,5116
-ovld/recode.py,sha256=Vc97Nv1j2GWuitLOzIuIhpscZ4gaOJQP3hLNp8SGTQ8,17890
-ovld/typemap.py,sha256=U_BmXtts1oYVa6gI3cgGHMX5kFcCJY_mt_cjWvDo3jQ,12979
-ovld/types.py,sha256=Zeb7xhHbL4T7qIRHI-I_cjG61UIWrfZv_EwjwqhB-rY,6381
-ovld/utils.py,sha256=V6Y8oZ6ojq8JaODL1rMZbU5L9QG0YSqHNYmpIFiwy3M,1294
-ovld/version.py,sha256=yhiWOz0HoJGRRI9-JQ2eh_0AbByy-6psK08-kpTSHJw,18
-ovld-0.4.0.dist-info/METADATA,sha256=4NkzmXbqa8ZNCwESYT4U8yILZyaIlw1rcghfCyaT50U,7526
-ovld-0.4.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-ovld-0.4.0.dist-info/licenses/LICENSE,sha256=cSwNTIzd1cbI89xt3PeZZYJP2y3j8Zus4bXgo4svpX8,1066
-ovld-0.4.0.dist-info/RECORD,,