ovld 0.4.5__py3-none-any.whl → 0.4.6__py3-none-any.whl

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/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/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/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/version.py

@@ -1 +1 @@
-version = "0.4.5"
+version = "0.4.6"

{ovld-0.4.5.dist-info → ovld-0.4.6.dist-info}/METADATA

@@ -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.6.dist-info/RECORD

@@ -0,0 +1,15 @@
+ovld/__init__.py,sha256=IVzs4_9skMa_UGZsGT7Ra_dIxj7KKNlV77XxlqcS6ow,1446
+ovld/abc.py,sha256=4qpZyYwI8dWgY1Oiv5FhdKg2uzNcyWxIpGmGJVcjXrs,1177
+ovld/core.py,sha256=MtRcJNhMwsix2Y7zP1fQS-taCy_t0bqkjHQdLF8WE8E,25719
+ovld/dependent.py,sha256=M85EJPRGNnEpmsr3tEX1U-1di1cxQb5-0oQtLgvfRoA,10183
+ovld/mro.py,sha256=D9KY3KEFnWL_SXZqHsVKNgRM1E0d8TPPILVZ3SxdUb4,4643
+ovld/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ovld/recode.py,sha256=bwsdM-TPpSQEmJhv8G30yDLrF8_I5wyTXpITMCC1W9k,17961
+ovld/typemap.py,sha256=PH5dy8ddVCcqj2TkQbgsM7fmCdHsJT9WGXFPn4JZsCA,13131
+ovld/types.py,sha256=lvOl1fldIqCJM-TvvdM2nMvAYDgcA45awfpkUB6kKpo,12984
+ovld/utils.py,sha256=k-cVMbJigtdeuD5_JEYtq1a6fXhmUGqLfBu8YxYd5VY,3395
+ovld/version.py,sha256=DWNNbWBv-hyqVy76bKbnHWaDUbqL0BOtdkPSV_88dx0,18
+ovld-0.4.6.dist-info/METADATA,sha256=mXEwvqopBdpksDEKETVZkp-airCb48yt4AWZIQ2r2wU,7833
+ovld-0.4.6.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+ovld-0.4.6.dist-info/licenses/LICENSE,sha256=cSwNTIzd1cbI89xt3PeZZYJP2y3j8Zus4bXgo4svpX8,1066
+ovld-0.4.6.dist-info/RECORD,,

ovld-0.4.5.dist-info/RECORD

@@ -1,14 +0,0 @@
-ovld/__init__.py,sha256=IVzs4_9skMa_UGZsGT7Ra_dIxj7KKNlV77XxlqcS6ow,1446
-ovld/abc.py,sha256=4qpZyYwI8dWgY1Oiv5FhdKg2uzNcyWxIpGmGJVcjXrs,1177
-ovld/core.py,sha256=MtRcJNhMwsix2Y7zP1fQS-taCy_t0bqkjHQdLF8WE8E,25719
-ovld/dependent.py,sha256=nyrkkmgxGjcHnZjKqbk7_g4_D91SYfYTPIE32LOvC9o,10184
-ovld/mro.py,sha256=0cJK_v-POCiuwjluwf8fWeQ3G-2chEUv3KYe57GC61Q,4552
-ovld/recode.py,sha256=bwsdM-TPpSQEmJhv8G30yDLrF8_I5wyTXpITMCC1W9k,17961
-ovld/typemap.py,sha256=PH5dy8ddVCcqj2TkQbgsM7fmCdHsJT9WGXFPn4JZsCA,13131
-ovld/types.py,sha256=EZNv8pThbo47KBULYM3R0R3sM2C5LC4DWraXZImkiNs,12877
-ovld/utils.py,sha256=jrrG_BqjI3W7x285nLuYiy5ui9LbNltblFVTlOWHYiU,3123
-ovld/version.py,sha256=GzDw9yI90LiIOYlw5gZBih8gPe3URgiM0vAFi2-I3ro,18
-ovld-0.4.5.dist-info/METADATA,sha256=AM7DiTgyU53Z0A7s8MIJJ3t1rgk1pxf3uqPU20kVO6o,7833
-ovld-0.4.5.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-ovld-0.4.5.dist-info/licenses/LICENSE,sha256=cSwNTIzd1cbI89xt3PeZZYJP2y3j8Zus4bXgo4svpX8,1066
-ovld-0.4.5.dist-info/RECORD,,