ovld 0.4.0__tar.gz → 0.4.1__tar.gz

{ovld-0.4.0 → ovld-0.4.1}/PKG-INFO

@@ -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.0 → ovld-0.4.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ovld"
-version = "0.4.0"
+version = "0.4.1"
 description = "Overloading Python functions"
 authors = [
     { name = "Olivier Breuleux", email = "breuleux@gmail.com" }
@@ -8,10 +8,13 @@ authors = [
 dependencies = []
 readme = "README.md"
 license = "MIT"
-homepage = "https://github.com/breuleux/ovld"
-repository = "https://github.com/breuleux/ovld"
 requires-python = ">= 3.9"
 
+[project.urls]
+Homepage = "https://ovld.readthedocs.io/en/latest/"
+Documentation = "https://ovld.readthedocs.io/en/latest/"
+Repository = "https://github.com/breuleux/ovld"
+
 [build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"
@@ -41,9 +44,6 @@ line-length = 80
 extend-select = ["I"]
 ignore = ["E241", "F722", "E501", "E203", "F811", "F821"]
 
-[tool.ruff.lint.per-file-ignores]
-"__init__.py" = ["F401", "F403"]
-
 [tool.pytest.ini_options]
 minversion = "6.0"
 addopts = "--benchmark-columns=median,min,max"

{ovld-0.4.0 → ovld-0.4.1}/src/ovld/__init__.py

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

{ovld-0.4.0 → ovld-0.4.1}/src/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-0.4.0 → ovld-0.4.1}/src/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-0.4.1/src/ovld/version.py

@@ -0,0 +1 @@
+version = "0.4.1"

ovld-0.4.1/tests/test_mro.py

@@ -0,0 +1,51 @@
+try:
+    from types import UnionType
+except ImportError:  # pragma: no cover
+    UnionType = None
+
+import sys
+from typing import Union
+
+from ovld.mro import Order, subclasscheck, typeorder
+
+
+class A:
+    pass
+
+
+class B(A):
+    pass
+
+
+def test_subclasscheck():
+    assert subclasscheck(B, A)
+    assert not subclasscheck(A, B)
+    assert subclasscheck(A, A)
+    assert subclasscheck(A, object)
+    assert subclasscheck(A, Union[A, int])
+    assert subclasscheck(int, Union[A, int])
+
+
+def test_subclasscheck_generic():
+    assert subclasscheck(list[int], list[int])
+    assert subclasscheck(list[int], list[object])
+    assert not subclasscheck(list[object], list[int])
+
+
+def test_subclasscheck_type():
+    assert subclasscheck(type[int], type[object])
+
+
+def test_subclasscheck_type_union():
+    if sys.version_info >= (3, 10):
+        assert subclasscheck(type[int | str], type[UnionType])
+    assert subclasscheck(type[Union[int, str]], type[Union])
+    assert subclasscheck(type[Union], object)
+    assert not subclasscheck(object, type[Union])
+
+
+def test_typeorder_type_union():
+    if sys.version_info >= (3, 10):
+        assert typeorder(type[int | str], type[UnionType]) is Order.LESS
+    assert typeorder(type[Union[int, str]], type[Union]) is Order.LESS
+    assert typeorder(object, type[Union]) is Order.MORE

{ovld-0.4.0 → ovld-0.4.1}/tests/test_ovld.py

@@ -1560,6 +1560,14 @@ def test_keywords_recurse():
     assert f([1, 2, 3], factor=3) == [3, 6, 9]
 
 
+def test_passing_types_to_normal_func():
+    @ovld
+    def f(x):
+        return x
+
+    assert f(list[int]) == list[int]
+
+
 def test_doc(file_regression):
     @ovld
     def mushroom(x: int):

ovld-0.4.0/src/ovld/version.py

@@ -1 +0,0 @@
-version = "0.4.0"