ovld 0.5.5__tar.gz → 0.5.6__tar.gz

{ovld-0.5.5 → ovld-0.5.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ovld
-Version: 0.5.5
+Version: 0.5.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.5.5 → ovld-0.5.6}/pyproject.toml

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

{ovld-0.5.5 → ovld-0.5.6}/src/ovld/dependent.py

@@ -15,22 +15,15 @@ from .types import (
     Intersection,
     Order,
     clsstring,
-    get_args,
     normalize_type,
     subclasscheck,
     typeorder,
 )
 
 
-def is_dependent(t):
-    if isinstance(t, DependentType):
-        return True
-    elif any(is_dependent(subt) for subt in get_args(t)):
-        return True
-    return False
-
-
 class DependentType(type):
+    __dependent__ = True
+
     exclusive_type = False
     keyable_type = False
     bound_is_name = False

{ovld-0.5.5 → ovld-0.5.6}/src/ovld/mro.py

@@ -3,7 +3,7 @@ from enum import Enum
 from graphlib import TopologicalSorter
 from typing import get_args, get_origin
 
-from .utils import UnionTypes
+from .utils import UnionTypes, is_dependent
 
 
 class Order(Enum):
@@ -123,6 +123,11 @@ def subclasscheck(t1, t2):
     ):
         return result
 
+    if is_dependent(t2):
+        # t2's instancecheck could return anything, and unless it defines
+        # __is_supertype__ or __is_subtype__ the bound devolves to object
+        return True
+
     if t2 in UnionTypes:
         return isinstance(t1, t2)
 

{ovld-0.5.5 → ovld-0.5.6}/src/ovld/recode.py

@@ -12,7 +12,7 @@ from .codegen import (
     rename_function,
     transfer_function,
 )
-from .utils import MISSING, NameDatabase, SpecialForm, UsageError, subtler_type
+from .utils import MISSING, NameDatabase, SpecialForm, UsageError, is_dependent, subtler_type
 
 recurse = SpecialForm("recurse")
 call_next = SpecialForm("call_next")
@@ -160,8 +160,6 @@ def generate_dispatch(ov, arganal):
 
 
 def generate_dependent_dispatch(tup, handlers, next_call, slf, name, err, nerr):
-    from .dependent import is_dependent
-
     def to_dict(tup):
         return dict(
             entry if isinstance(entry, tuple) else (i, entry) for i, entry in enumerate(tup)

{ovld-0.5.5 → ovld-0.5.6}/src/ovld/typemap.py

@@ -6,7 +6,7 @@ from types import CodeType
 
 from .mro import sort_types
 from .recode import generate_dependent_dispatch
-from .utils import MISSING, CodegenInProgress, subtler_type
+from .utils import MISSING, CodegenInProgress, is_dependent, subtler_type
 
 
 class TypeMap(dict):
@@ -213,8 +213,6 @@ class MultiTypeMap(dict):
             sig: A Signature object.
             handler: A function to handle the tuple.
         """
-        from .dependent import is_dependent
-
         self.clear()
 
         obj_t_tup = sig.types
@@ -251,8 +249,6 @@ class MultiTypeMap(dict):
             print(f"{'':{width - 2}} @ {co.co_filename}:{co.co_firstlineno}")
 
     def display_resolution(self, *args, **kwargs):
-        from .dependent import is_dependent
-
         def dependent_match(tup, args):
             for t, a in zip(tup, args):
                 if isinstance(t, tuple):

{ovld-0.5.5 → ovld-0.5.6}/src/ovld/types.py

@@ -10,14 +10,9 @@ from .codegen import Code
 from .mro import Order, TypeRelationship, subclasscheck, typeorder
 from .recode import generate_checking_code
 from .typemap import TypeMap
-from .utils import UnionType, UnionTypes, UsageError, clsstring
+from .utils import UnionType, UnionTypes, UsageError, clsstring, get_args
 
-
-def get_args(tp):
-    args = getattr(tp, "__args__", None)
-    if not isinstance(args, tuple):
-        args = ()
-    return args
+NoneType = type(None)
 
 
 def eval_annotation(t, ctx, locals, catch=False):
@@ -90,6 +85,8 @@ class TypeNormalizer:
             raise UsageError(
                 f"Dependent type {t} has not been given a type bound. Please use Dependent[<bound>, {t}] instead."
             )
+        elif t is None:
+            return NoneType
         else:
             return t
 
@@ -103,6 +100,8 @@ def _(self, t, fn):
 
 
 class MetaMC(type):
+    __dependent__ = False
+
     def __new__(T, name, handler):
         return super().__new__(T, name, (), {"_handler": handler})
 

{ovld-0.5.5 → ovld-0.5.6}/src/ovld/utils.py

@@ -4,6 +4,7 @@ import builtins
 import functools
 import re
 import typing
+from abc import ABCMeta
 from itertools import count
 
 _builtins_dict = vars(builtins)
@@ -183,3 +184,31 @@ class NameDatabase:
         return name
 
     __getitem__ = get
+
+
+def get_args(tp):
+    args = getattr(tp, "__args__", None)
+    if not isinstance(args, tuple):
+        args = ()
+    return args
+
+
+_standard_instancechecks = {
+    type.__instancecheck__,
+    GenericAlias.__instancecheck__,
+    type(list[object]).__instancecheck__,
+    ABCMeta.__instancecheck__,
+    type(typing.Protocol).__instancecheck__,
+}
+
+
+def is_dependent(t):
+    if any(is_dependent(subt) for subt in get_args(t)):
+        return True
+    elif hasattr(t, "__dependent__"):
+        return t.__dependent__
+    elif not isinstance(t, type):
+        return False
+    elif type(t).__instancecheck__ not in _standard_instancechecks:
+        return True
+    return False

ovld-0.5.6/src/ovld/version.py

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

{ovld-0.5.5 → ovld-0.5.6}/tests/test_dependent.py

@@ -350,3 +350,31 @@ def test_keyed_plus_other():
     assert f(0, 50) == "yes"
     assert f(3, 50) == "yes"
     assert f(0, 150) == "no"
+
+
+class Lettered(type):
+    def __instancecheck__(cls, x):
+        return cls.letter in (getattr(x, "__name__", None) or str(x))
+
+
+LetterF = Lettered("LetterF", (), {"letter": "f"})
+LetterX = Lettered("LetterX", (), {"letter": "x"})
+
+
+def test_arbitrary_instancecheck():
+    @ovld
+    def f(x: LetterX):
+        return "X-TREME"
+
+    @ovld
+    def f(x: LetterF):
+        return "fudged"
+
+    @ovld
+    def f(x: object):
+        return False
+
+    assert f(next) == "X-TREME"
+    assert f("wow") is False
+    assert f("extreme") == "X-TREME"
+    assert f(filter) == "fudged"

{ovld-0.5.5 → ovld-0.5.6}/tests/test_ovld.py

@@ -324,6 +324,19 @@ def test_optional():
     assert f(1.0) == "f"
 
 
+def test_none():
+    @ovld
+    def f(x: None):
+        return "null"
+
+    @ovld
+    def f(x: object):
+        return "X"
+
+    assert f(None) == "null"
+    assert f(123) == "X"
+
+
 def test_abstract_types():
     from collections.abc import Iterable
 

{ovld-0.5.5 → ovld-0.5.6}/uv.lock

@@ -167,7 +167,7 @@ name = "importlib-metadata"
 version = "8.7.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
-    { name = "zipp" },
+    { name = "zipp", marker = "python_full_version < '3.10'" },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/76/66/650a33bd90f786193e4de4b3ad86ea60b53c89b669a5c7be931fac31cdb0/importlib_metadata-8.7.0.tar.gz", hash = "sha256:d13b81ad223b890aa16c5471f2ac3056cf76c5f10f82d6f9292f0b415f389000", size = 56641 }
 wheels = [
@@ -366,7 +366,7 @@ wheels = [
 
 [[package]]
 name = "ovld"
-version = "0.5.4"
+version = "0.5.5"
 source = { editable = "." }
 
 [package.dev-dependencies]

ovld-0.5.5/src/ovld/version.py

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