ovld 0.3.1__py3-none-any.whl → 0.3.3__py3-none-any.whl

ovld/core.py

@@ -7,10 +7,19 @@ import textwrap
 import typing
 from types import FunctionType
 
+try:
+    from types import UnionType
+except ImportError:  # pragma: no cover
+    UnionType = None
+
 from .mro import compose_mro
 from .utils import BOOTSTRAP, MISSING, keyword_decorator
 
 
+def is_type_of_type(t):
+    return getattr(t, "__origin__", None) is type
+
+
 class TypeMap(dict):
     """Represents a mapping from types to handlers.
 
@@ -31,7 +40,8 @@ class TypeMap(dict):
     def register(self, obj_t, handler):
         """Register a handler for the given object type."""
         self.clear()
-        self.types.add(obj_t)
+        if not is_type_of_type(obj_t):
+            self.types.add(obj_t)
         s = self.entries.setdefault(obj_t, set())
         s.add(handler)
 
@@ -42,7 +52,10 @@ class TypeMap(dict):
         the next time getitem is called.
         """
         results = {}
-        mro = compose_mro(obj_t, self.types)
+        if is_type_of_type(obj_t):
+            mro = [type[t] for t in compose_mro(obj_t.__args__[0], self.types)]
+        else:
+            mro = compose_mro(obj_t, self.types)
         for lvl, cls in enumerate(reversed(mro)):
             handlers = self.entries.get(cls, None)
             if handlers:
@@ -77,9 +90,14 @@ class MultiTypeMap(dict):
     def __init__(self, key_error=KeyError):
         self.maps = {}
         self.empty = MISSING
-        self.transform = type
         self.key_error = key_error
 
+    def transform(self, obj):
+        if isinstance(obj, type):
+            return type[obj]
+        else:
+            return type(obj)
+
     def register(self, obj_t_tup, nargs, handler):
         """Register a handler for a tuple of argument types.
 
@@ -326,6 +344,9 @@ class _Ovld:
         def clsname(cls):
             if cls is object:
                 return "*"
+            elif is_type_of_type(cls):
+                arg = clsname(cls.__args__[0])
+                return f"type[{arg}]"
             elif hasattr(cls, "__name__"):
                 return cls.__name__
             else:
@@ -489,11 +510,15 @@ class _Ovld:
 
         def _normalize_type(t, force_tuple=False):
             origin = getattr(t, "__origin__", None)
-            if origin is typing.Union:
+            if UnionType and isinstance(t, UnionType):
+                return _normalize_type(t.__args__)
+            elif origin is type:
+                return (t,) if force_tuple else t
+            elif origin is typing.Union:
                 return _normalize_type(t.__args__)
             elif origin is not None:
                 raise TypeError(
-                    "ovld does not accept generic types except Union or Optional"
+                    "ovld does not accept generic types except type, Union or Optional"
                 )
             elif isinstance(t, tuple):
                 return tuple(_normalize_type(t2) for t2 in t)
@@ -651,6 +676,11 @@ class _Ovld:
         return f"<Ovld {self.name or hex(id(self))}>"
 
 
+def is_ovld(x):
+    """Return whether the argument is an ovld function/method."""
+    return isinstance(x, _Ovld)
+
+
 class OvldCall:
     """Context for an Ovld call."""
 
@@ -770,13 +800,12 @@ class OvldMC(type):
 
         for name in names:
             values = [getattr(base, name, None) for base in bases]
+            ovlds = [v for v in values if is_ovld(v)]
             mixins = [
-                v
-                for v in values
-                if is_ovld(v) and getattr(v, "_extend_super", False)
+                v for v in ovlds[1:] if getattr(v, "_extend_super", False)
             ]
             if mixins:
-                o = mixins[0].copy(mixins=mixins[1:])
+                o = ovlds[0].copy(mixins=mixins)
                 others = [v for v in values if v is not None and not is_ovld(v)]
                 for other in others:
                     o.register(other)
@@ -786,6 +815,10 @@ class OvldMC(type):
         return d
 
 
+class OvldBase(metaclass=OvldMC):
+    """Base class that allows overloading of methods."""
+
+
 def _find_overload(fn, **kwargs):
     mod = __import__(fn.__module__, fromlist="_")
     dispatch = getattr(mod, fn.__qualname__, None)
@@ -915,7 +948,10 @@ class Conformer:
 
 def rename_code(co, newname):  # pragma: no cover
     if hasattr(co, "replace"):
-        return co.replace(co_name=newname)
+        if hasattr(co, "co_qualname"):
+            return co.replace(co_name=newname, co_qualname=newname)
+        else:
+            return co.replace(co_name=newname)
     else:
         return type(co)(
             co.co_argcount,
@@ -946,14 +982,10 @@ def rename_function(fn, newname):
     return new_fn
 
 
-def is_ovld(x):
-    """Return whether the argument is an ovld function/method."""
-    return isinstance(x, _Ovld)
-
-
 __all__ = [
     "MultiTypeMap",
     "Ovld",
+    "OvldBase",
     "OvldCall",
     "OvldMC",
     "TypeMap",

ovld/version.py

@@ -1 +1 @@
-version = "0.3.1"
+version = "0.3.3"

{ovld-0.3.1.dist-info → ovld-0.3.3.dist-info}/METADATA

@@ -1,18 +1,19 @@
 Metadata-Version: 2.1
 Name: ovld
-Version: 0.3.1
+Version: 0.3.3
 Summary: Overloading Python functions
 Home-page: https://github.com/breuleux/ovld
 License: MIT
 Author: Olivier Breuleux
 Author-email: breuleux@gmail.com
-Requires-Python: >=3.6,<4.0
+Requires-Python: >=3.8,<4.0
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Project-URL: Repository, https://github.com/breuleux/ovld
 Description-Content-Type: text/markdown
 

ovld-0.3.3.dist-info/RECORD

@@ -0,0 +1,9 @@
+ovld/__init__.py,sha256=Wa7MHfDw0_AV7jwSwepntCeXzZheELkb8paxVnjp58Q,85
+ovld/core.py,sha256=uLRvhoXb0d8ide648_e1EsYdqDZZZtz3rLqVAsOdisw,32571
+ovld/mro.py,sha256=Dof3wj-BLcV-T-Jm9tK6zqptp_JGo5lxgyRq99AvY1k,5006
+ovld/utils.py,sha256=JT44u-OiFC2QBUylaubwKlgvvRS0EYPfykxgMbbIrMY,3521
+ovld/version.py,sha256=nlGXcobmeAmNzRkhqDLZxGFLcidRwZSZPlWcdlVyxvw,18
+ovld-0.3.3.dist-info/LICENSE,sha256=cSwNTIzd1cbI89xt3PeZZYJP2y3j8Zus4bXgo4svpX8,1066
+ovld-0.3.3.dist-info/METADATA,sha256=vf9bZaiRGKrZzreiu_jvSFLkIzd4cyP6Agz4qarM4Zc,9439
+ovld-0.3.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ovld-0.3.3.dist-info/RECORD,,

{ovld-0.3.1.dist-info → ovld-0.3.3.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry 1.0.0
+Generator: poetry-core 1.9.0
 Root-Is-Purelib: true
 Tag: py3-none-any

ovld-0.3.1.dist-info/RECORD

@@ -1,9 +0,0 @@
-ovld/__init__.py,sha256=Wa7MHfDw0_AV7jwSwepntCeXzZheELkb8paxVnjp58Q,85
-ovld/core.py,sha256=NOxlxUFe8NFpdAm_UyMlZihs-zXHTZFaXwc4jgfZtrY,31553
-ovld/mro.py,sha256=Dof3wj-BLcV-T-Jm9tK6zqptp_JGo5lxgyRq99AvY1k,5006
-ovld/utils.py,sha256=JT44u-OiFC2QBUylaubwKlgvvRS0EYPfykxgMbbIrMY,3521
-ovld/version.py,sha256=sEAhGxRzEBE5t0VjAcJ-336II62pGIQ0eLrs42I-sGU,18
-ovld-0.3.1.dist-info/LICENSE,sha256=cSwNTIzd1cbI89xt3PeZZYJP2y3j8Zus4bXgo4svpX8,1066
-ovld-0.3.1.dist-info/WHEEL,sha256=SrtnPGVTMeYWttls9xnWA01eUhCZ3ufFdJUYb1J3r-U,83
-ovld-0.3.1.dist-info/METADATA,sha256=2n-dwrZZf8ZP_8MiSJzRSPXdWZvPBtOmTFluB0Yktxk,9386
-ovld-0.3.1.dist-info/RECORD,,