ovld 0.4.5__tar.gz → 0.4.6__tar.gz

{ovld-0.4.5 → ovld-0.4.6}/.github/workflows/python-package.yml

@@ -40,6 +40,8 @@ jobs:
         - python: '3.11'
           coverage: false
         - python: '3.12'
+          coverage: false
+        - python: '3.13'
           coverage: true
     steps:
     - name: Check out the code
@@ -70,6 +72,7 @@ jobs:
         - python: '3.10'
         - python: '3.11'
         - python: '3.12'
+        - python: '3.13'
     steps:
     - name: Check out the code
       uses: actions/checkout@v3

ovld-0.4.6/.python-version

@@ -0,0 +1 @@
+3.13

{ovld-0.4.5 → ovld-0.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ovld
-Version: 0.4.5
+Version: 0.4.6
 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.5 → ovld-0.4.6}/bench.py

@@ -28,7 +28,6 @@ def smap(x: dict, y: dict):
 
 @ovld
 def smap(x: object, z: object):
-    1 / 0
     return x + z
 
 

ovld-0.4.6/ichk.py

@@ -0,0 +1,39 @@
+from ovld.types import Dataclass
+
+
+class metatron(type):
+    def __subclasscheck__(cls, c):
+        return True
+
+    # def __instancecheck__(cls, arg):
+    #     print(cls)
+    #     return arg == 3
+
+
+class A(metaclass=metatron):
+    pass
+
+
+class B:
+    pass
+
+
+class C:
+    pass
+
+
+print(issubclass(B, A))
+print(isinstance(B(), A))
+# print(isinstance(3, A))
+
+
+def see(x):
+    ichk = type(x).__instancecheck__
+    print(id(ichk), ichk)
+
+
+see(Dataclass)
+see(A)
+see(C)
+see(object)
+see(int)

{ovld-0.4.5 → ovld-0.4.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ovld"
-version = "0.4.5"
+version = "0.4.6"
 description = "Overloading Python functions"
 authors = [
     { name = "Olivier Breuleux", email = "breuleux@gmail.com" }

{ovld-0.4.5 → ovld-0.4.6}/src/ovld/dependent.py

@@ -15,6 +15,7 @@ from .types import (
     Intersection,
     Order,
     clsstring,
+    get_args,
     normalize_type,
     subclasscheck,
     typeorder,
@@ -61,7 +62,7 @@ def combine(master_template, args):
 def is_dependent(t):
     if isinstance(t, DependentType):
         return True
-    elif any(is_dependent(subt) for subt in getattr(t, "__args__", ())):
+    elif any(is_dependent(subt) for subt in get_args(t)):
         return True
     return False
 

{ovld-0.4.5 → ovld-0.4.6}/src/ovld/mro.py

@@ -3,6 +3,8 @@ from enum import Enum
 from graphlib import TopologicalSorter
 from typing import get_args, get_origin
 
+from .utils import UnionTypes
+
 
 class Order(Enum):
     LESS = -1
@@ -121,6 +123,9 @@ def subclasscheck(t1, t2):
     ):
         return result
 
+    if t2 in UnionTypes:
+        return isinstance(t1, t2)
+
     o1 = get_origin(t1)
     o2 = get_origin(t2)
 

{ovld-0.4.5 → ovld-0.4.6}/src/ovld/types.py

@@ -3,16 +3,18 @@ import sys
 import typing
 from dataclasses import dataclass
 from functools import partial
-from typing import Protocol, runtime_checkable
+from typing import Protocol, get_args, runtime_checkable
 
 from .mro import Order, TypeRelationship, subclasscheck, typeorder
 from .typemap import TypeMap
-from .utils import UsageError, clsstring
+from .utils import UnionType, UnionTypes, UsageError, clsstring
 
-try:
-    from types import UnionType
-except ImportError:  # pragma: no cover
-    UnionType = None
+
+def get_args(tp):
+    args = getattr(tp, "__args__", None)
+    if not isinstance(args, tuple):
+        args = ()
+    return args
 
 
 class TypeNormalizer:
@@ -37,6 +39,8 @@ class TypeNormalizer:
             t = object
         elif t is inspect._empty:
             t = object
+        elif t in UnionTypes:
+            return type[t]
         elif isinstance(t, typing._AnnotatedAlias):
             t = t.__origin__
 
@@ -82,7 +86,7 @@ class MetaMC(type):
         return super().__new__(T, name, (), {"_handler": handler})
 
     def __init__(cls, name, handler):
-        cls.__args__ = getattr(handler, "__args__", ())
+        cls.__args__ = get_args(handler)
 
     def codegen(cls):
         return cls._handler.codegen()

{ovld-0.4.5 → ovld-0.4.6}/src/ovld/utils.py

@@ -5,6 +5,15 @@ import re
 import typing
 from itertools import count
 
+try:
+    from types import UnionType
+
+    UnionTypes = (type(typing.Union[int, str]), UnionType)
+
+except ImportError:  # pragma: no cover
+    UnionType = None
+    UnionTypes = (type(typing.Union[int, str]),)
+
 
 class Named:
     """A named object.
@@ -90,6 +99,8 @@ def clsstring(cls):
 def subtler_type(obj):
     if isinstance(obj, GenericAlias):
         return type[obj]
+    elif isinstance(obj, UnionTypes):
+        return type[obj]
     elif obj is typing.Any:
         return type[object]
     elif isinstance(obj, type):

ovld-0.4.6/src/ovld/version.py

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

{ovld-0.4.5 → ovld-0.4.6}/tests/test_ovld.py

@@ -18,6 +18,7 @@ from ovld import (
     recurse,
 )
 from ovld.dependent import Dependent, Equals, StartsWith
+from ovld.types import UnionTypes
 from ovld.utils import MISSING, UsageError
 
 from .test_typemap import Animal, Bird, Mammal
@@ -1240,6 +1241,28 @@ def test_type_any():
     assert f(typing.Any) == "yes"
 
 
+UT = type(typing.Union[int, str])
+
+
+@pytest.mark.skipif(
+    sys.version_info < (3, 10),
+    reason="union syntax requires python3.10 or higher",
+)
+def test_union_catchall():
+    @ovld
+    def f(t: UnionTypes):
+        return "yes"
+
+    @ovld
+    def f(t: type[object]):
+        return "no"
+
+    assert f(typing.Optional[float]) == "yes"
+    assert f(typing.Union[int, str]) == "yes"
+    assert f(int | str) == "yes"
+    assert f(int) == "no"
+
+
 def test_annotated():
     @ovld
     def f(x: typing.Annotated[int, "blah"]):

{ovld-0.4.5 → ovld-0.4.6}/typo.py

@@ -1,13 +1,23 @@
 # from typing import TYPE_CHECKING
-# from ovld import ovld
+from ovld import ovld
+from ovld.core import OvldMC
+
 # from plum import dispatch as ovld
 # from multimethod import multimethod as ovld
-from runtype import multidispatch as ovld
+# from runtype import multidispatch as ovld
 
 # # if TYPE_CHECKING:
 # from typing import overload
 
 
+class O(metaclass=OvldMC):
+    def f(self, x: int):
+        pass
+
+    def f(self, x: str):
+        pass
+
+
 @ovld
 def f(x: int) -> int:
     "A"
@@ -23,3 +33,4 @@ def f(x: str) -> int:
 f
 print(f(8))
 print(f("8"))
+print(f([]))

{ovld-0.4.5 → ovld-0.4.6}/uv.lock

@@ -330,7 +330,7 @@ wheels = [
 
 [[package]]
 name = "ovld"
-version = "0.4.3"
+version = "0.4.5"
 source = { editable = "." }
 
 [package.dev-dependencies]

ovld-0.4.5/.python-version

@@ -1 +0,0 @@
-3.12.4

ovld-0.4.5/src/ovld/version.py

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