ducktools-classbuilder 0.7.0__py3-none-any.whl → 0.7.2__py3-none-any.whl

ducktools/classbuilder/__init__.py

@@ -363,15 +363,17 @@ def eq_generator(cls, funcname="__eq__"):
     ]
 
     if field_names:
-        selfvals = ",".join(f"self.{name}" for name in field_names)
-        othervals = ",".join(f"other.{name}" for name in field_names)
-        instance_comparison = f"({selfvals},) == ({othervals},)"
+        instance_comparison = "\n        and ".join(
+            f"self.{name} == other.{name}" for name in field_names
+        )
     else:
         instance_comparison = "True"
 
     code = (
         f"def {funcname}(self, other):\n"
-        f"    return {instance_comparison} if {class_comparison} else NotImplemented\n"
+        f"    return (\n"
+        f"        {instance_comparison}\n"
+        f"    ) if {class_comparison} else NotImplemented\n"
     )
     globs = {}
 
@@ -390,11 +392,13 @@ def frozen_setattr_generator(cls, funcname="__setattr__"):
     if flags.get("slotted", True):
         globs["__setattr_func"] = object.__setattr__
         setattr_method = "__setattr_func(self, name, value)"
+        hasattr_check = "hasattr(self, name)"
     else:
         setattr_method = "self.__dict__[name] = value"
+        hasattr_check = "name in self.__dict__"
 
     body = (
-        f"    if hasattr(self, name) or name not in __field_names:\n"
+        f"    if {hasattr_check} or name not in __field_names:\n"
         f'        raise TypeError(\n'
         f'            f"{{type(self).__name__!r}} object does not support "'
         f'            f"attribute assignment"\n'
@@ -707,10 +711,6 @@ def make_slot_gatherer(field_type=Field):
                 "in order to generate a slotclass"
             )
 
-        # Don't want to mutate original annotations so make a copy if it exists
-        # Looking at the dict is a Python3.9 or earlier requirement
-        cls_annotations = get_ns_annotations(cls_dict)
-
         cls_fields = {}
         slot_replacement = {}
 
@@ -724,8 +724,6 @@ def make_slot_gatherer(field_type=Field):
 
             if isinstance(v, field_type):
                 attrib = v
-                if attrib.type is not NOTHING:
-                    cls_annotations[k] = attrib.type
             else:
                 # Plain values treated as defaults
                 attrib = field_type(default=v)
@@ -738,7 +736,6 @@ def make_slot_gatherer(field_type=Field):
         # In this case, slots with documentation and new annotations.
         modifications = {
             "__slots__": slot_replacement,
-            "__annotations__": cls_annotations,
         }
 
         return cls_fields, modifications
@@ -748,7 +745,7 @@ def make_slot_gatherer(field_type=Field):
 
 def make_annotation_gatherer(
     field_type=Field,
-    leave_default_values=True,
+    leave_default_values=False,
 ):
     """
     Create a new annotation gatherer that will work with `Field` instances
@@ -814,7 +811,7 @@ def make_annotation_gatherer(
 
 def make_field_gatherer(
     field_type=Field,
-    leave_default_values=True,
+    leave_default_values=False,
 ):
     def field_attribute_gatherer(cls_or_ns):
         if isinstance(cls_or_ns, (_MappingProxyType, dict)):
@@ -847,7 +844,7 @@ def make_field_gatherer(
 
 def make_unified_gatherer(
     field_type=Field,
-    leave_default_values=True,
+    leave_default_values=False,
 ):
     """
     Create a gatherer that will work via first slots, then
@@ -897,7 +894,7 @@ annotation_gatherer = make_annotation_gatherer()
 
 # The unified gatherer used for slot classes must remove default
 # values for slots to work correctly.
-unified_gatherer = make_unified_gatherer(leave_default_values=False)
+unified_gatherer = make_unified_gatherer()
 
 
 # Now the gatherers have been defined, add __repr__ and __eq__ to Field.
@@ -963,7 +960,7 @@ class AnnotationClass(metaclass=SlotMakerMeta):
     def __init_subclass__(
             cls,
             methods=default_methods,
-            gatherer=make_unified_gatherer(leave_default_values=True),
+            gatherer=unified_gatherer,
             **kwargs
     ):
         # Check class dict otherwise this will always be True as this base

ducktools/classbuilder/__init__.pyi

@@ -178,37 +178,37 @@ def make_slot_gatherer(
 @typing.overload
 def make_annotation_gatherer(
     field_type: type[_FieldType],
-    leave_default_values: bool = True,
+    leave_default_values: bool = False,
 ) -> Callable[[type | _CopiableMappings], tuple[dict[str, _FieldType], dict[str, typing.Any]]]: ...
 
 @typing.overload
 def make_annotation_gatherer(
     field_type: _ReturnsField = Field,
-    leave_default_values: bool = True,
+    leave_default_values: bool = False,
 ) -> Callable[[type | _CopiableMappings], tuple[dict[str, Field], dict[str, typing.Any]]]: ...
 
 @typing.overload
 def make_field_gatherer(
     field_type: type[_FieldType],
-    leave_default_values: bool = True,
+    leave_default_values: bool = False,
 ) -> Callable[[type | _CopiableMappings], tuple[dict[str, _FieldType], dict[str, typing.Any]]]: ...
 
 @typing.overload
 def make_field_gatherer(
     field_type: _ReturnsField = Field,
-    leave_default_values: bool = True,
+    leave_default_values: bool = False,
 ) -> Callable[[type | _CopiableMappings], tuple[dict[str, Field], dict[str, typing.Any]]]: ...
 
 @typing.overload
 def make_unified_gatherer(
     field_type: type[_FieldType],
-    leave_default_values: bool = True,
+    leave_default_values: bool = False,
 ) -> Callable[[type | _CopiableMappings], tuple[dict[str, _FieldType], dict[str, typing.Any]]]: ...
 
 @typing.overload
 def make_unified_gatherer(
     field_type: _ReturnsField = Field,
-    leave_default_values: bool = True,
+    leave_default_values: bool = False,
 ) -> Callable[[type | _CopiableMappings], tuple[dict[str, Field], dict[str, typing.Any]]]: ...
 
 
@@ -249,7 +249,7 @@ class AnnotationClass(metaclass=SlotMakerMeta):
     def __init_subclass__(
         cls,
         methods: frozenset[MethodMaker] | set[MethodMaker] = default_methods,
-        gatherer: _gatherer_type = make_unified_gatherer(leave_default_values=True),
+        gatherer: _gatherer_type = unified_gatherer,
         **kwargs,
     ) -> None: ...
 

ducktools/classbuilder/_version.py

@@ -1,2 +1,2 @@
-__version__ = "0.7.0"
-__version_tuple__ = (0, 7, 0)
+__version__ = "0.7.2"
+__version_tuple__ = (0, 7, 2)

ducktools/classbuilder/annotations.py

@@ -24,6 +24,19 @@ import sys
 import builtins
 
 
+# Evil stuff from types.py
+def _cell_factory():
+    a = 1
+
+    def f():
+        nonlocal a
+    return f.__closure__[0]
+_FunctionType = type(_cell_factory)
+_CellType = type(_cell_factory())
+del _cell_factory
+# End evil stuff from types.py
+
+
 class _StringGlobs(dict):
     """
     Based on the fake globals dictionary used for annotations
@@ -99,6 +112,62 @@ def eval_hint(hint, context=None, *, recursion_limit=2):
     return hint
 
 
+def call_annotate_func(annotate):
+    # Python 3.14 breaks the old methods of getting annotations
+    # The new annotationlib currently relies on 'ast' and 'functools'
+    # that this project tries to avoid importing.
+
+    # The basic logic is copied from there, however, replacing ForwardRef
+    # with a more basic class.
+    # While `annotationlib` is trying to return ForwardRef objects that can
+    # be evaluated later, this module only cares about annotations that can
+    # be evaluated at the point this function is called.
+    # As such we throw away the other information and just return strings
+    # instead of forwardrefs.
+
+    try:
+        raw_annotations = annotate(1)
+    except NameError:
+        pass
+    else:
+        return raw_annotations
+
+    # The annotate func may support forwardref natively
+    try:
+        raw_annotations = annotate(2)
+    except NotImplementedError:
+        pass
+    else:
+        return raw_annotations
+
+    # Not supported so we have to implement our own deferred handling
+    # Some modified logic from annotationlib
+    namespace = {**annotate.__builtins__, **annotate.__globals__}
+    globs = _StringGlobs(namespace)
+
+    # This handles closures where the variable is defined after get annotations is called.
+    if annotate.__closure__:
+        freevars = annotate.__code__.co_freevars
+        new_closure = []
+        for i, cell in enumerate(annotate.__closure__):
+            try:
+                cell.cell_contents
+            except ValueError:
+                if i < len(freevars):
+                    name = freevars[i]
+                else:
+                    name = "__cell__"
+                new_closure.append(_CellType(name))
+            else:
+                new_closure.append(cell)
+        closure = tuple(new_closure)
+    else:
+        closure = None
+
+    new_annotate = _FunctionType(annotate.__code__, globs, closure=closure)
+    return new_annotate(1)
+
+
 def get_ns_annotations(ns, eval_str=True):
     """
     Given a class namespace, attempt to retrieve the
@@ -112,36 +181,50 @@ def get_ns_annotations(ns, eval_str=True):
     :param eval_str: Attempt to evaluate string annotations (default to True)
     :return: dictionary of evaluated annotations
     """
-    raw_annotations = ns.get("__annotations__", {})
 
-    if not eval_str:
-        return raw_annotations.copy()
+    # In 3.14 the 'canonical' method of getting annotations is to use __annotate__
+    # If this doesn't exist, check __annotations__ and treat as 3.13 or earlier.
+    annotate = ns.get("__annotate__")
 
-    try:
-        obj_modulename = ns["__module__"]
-    except KeyError:
-        obj_module = None
+    if annotate is not None:
+        raw_annotations = call_annotate_func(annotate)
     else:
-        obj_module = sys.modules.get(obj_modulename, None)
+        raw_annotations = ns.get("__annotations__", {})
 
-    if obj_module:
-        obj_globals = vars(obj_module)
-    else:
-        obj_globals = {}
+    # Unlike annotationlib we still try to evaluate string annotations
+    # This will catch cases where someone has used a literal string for a
+    # single attribute.
+    if eval_str:
+        try:
+            obj_modulename = ns["__module__"]
+        except KeyError:
+            obj_module = None
+        else:
+            obj_module = sys.modules.get(obj_modulename, None)
+
+        if obj_module:
+            obj_globals = vars(obj_module)
+        else:
+            obj_globals = {}
 
-    # Type parameters should be usable in hints without breaking
-    # This is for Python 3.12+
-    type_params = {
-        repr(param): param
-        for param in ns.get("__type_params__", ())
-    }
+        # Type parameters should be usable in hints without breaking
+        # This is for Python 3.12+
+        type_params = {
+            repr(param): param
+            for param in ns.get("__type_params__", ())
+        }
 
-    context = {**vars(builtins), **obj_globals, **type_params, **ns}
+        context = {**vars(builtins), **obj_globals, **type_params, **ns}
+
+        annotations = {
+            k: eval_hint(v, context)
+            for k, v in raw_annotations.items()
+        }
+
+    else:
+        annotations = raw_annotations.copy()
 
-    return {
-        k: eval_hint(v, context)
-        for k, v in raw_annotations.items()
-    }
+    return annotations
 
 
 def is_classvar(hint):

ducktools/classbuilder/annotations.pyi

@@ -1,3 +1,4 @@
+from collections.abc import Callable
 import typing
 import types
 
@@ -8,6 +9,11 @@ class _StringGlobs(dict):
     def __missing__(self, key: _T) -> _T: ...
 
 
+def call_annotate_func(
+        annotate: Callable[[int], dict[str, type | typing.ForwardRef]]
+) -> dict[str, type | str]: ...
+
+
 def eval_hint(
     hint: type | str,
     context: None | dict[str, typing.Any] = None,

{ducktools_classbuilder-0.7.0.dist-info → ducktools_classbuilder-0.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ducktools-classbuilder
-Version: 0.7.0
+Version: 0.7.2
 Summary: Toolkit for creating class boilerplate generators
 Author: David C Ellis
 License: MIT License
@@ -32,6 +32,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Operating System :: OS Independent
 Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.8

ducktools_classbuilder-0.7.2.dist-info/RECORD

@@ -0,0 +1,13 @@
+ducktools/classbuilder/__init__.py,sha256=sHgrsySQDxcvnkL0GsQu9Q4Um2-9gRFyGeYGgNAEjag,32521
+ducktools/classbuilder/__init__.pyi,sha256=t2KrEsEhKFbLpl0QeX0CiCy_VTRFRZO_2ABdfndRfZY,7939
+ducktools/classbuilder/_version.py,sha256=iYP0OHZX_Sj2gXyYk7ivc79K_EYWflz05BN2AbALx90,52
+ducktools/classbuilder/annotations.py,sha256=x-3936HcJzv04rga8k0fFTbu1656yDglVN6kCan4hiw,8203
+ducktools/classbuilder/annotations.pyi,sha256=vW3YQIiKYYQJll9_B4oTkBwIh4nOy1AnU9Ny8_a0dRY,686
+ducktools/classbuilder/prefab.py,sha256=6YOVVYYeuMF5gv9DnK-sCvNKxBaBoqDXNLUQ22-xINk,24097
+ducktools/classbuilder/prefab.pyi,sha256=x2ioTpkhNjQXFeKABFOzE0xNeZ8f_W5vusmuAzE19mc,4491
+ducktools/classbuilder/py.typed,sha256=la67KBlbjXN-_-DfGNcdOcjYumVpKG_Tkw-8n5dnGB4,8
+ducktools_classbuilder-0.7.2.dist-info/LICENSE.md,sha256=6Thz9Dbw8R4fWInl6sGl8Rj3UnKnRbDwrc6jZerpugQ,1070
+ducktools_classbuilder-0.7.2.dist-info/METADATA,sha256=o8V0NVephCbyJqbxiqqoIMerLLQsnQSYLQ5VrJWrUFk,10968
+ducktools_classbuilder-0.7.2.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+ducktools_classbuilder-0.7.2.dist-info/top_level.txt,sha256=uSDLtio3ZFqdwcsMJ2O5yhjB4Q3ytbBWbA8rJREganc,10
+ducktools_classbuilder-0.7.2.dist-info/RECORD,,

{ducktools_classbuilder-0.7.0.dist-info → ducktools_classbuilder-0.7.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.3.0)
+Generator: setuptools (74.1.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

ducktools_classbuilder-0.7.0.dist-info/RECORD

@@ -1,13 +0,0 @@
-ducktools/classbuilder/__init__.py,sha256=EylA7K40qGVctuGD_OLtcl-f0xqAICYw0MV-XqcDEhI,32869
-ducktools/classbuilder/__init__.pyi,sha256=NCLMWT3G0Z5lJky8EV_N6XcW8smScti6y2p163nZ8rM,7965
-ducktools/classbuilder/_version.py,sha256=TVtIAaEWunoxD4TTy8EMgVsVwLljxEqhLSu5_PMPjM8,52
-ducktools/classbuilder/annotations.py,sha256=17g1WnWfyMWBHKQp2HD_hvV-n7CKXy_zv8NTODpOsuU,5437
-ducktools/classbuilder/annotations.pyi,sha256=cTZQ-pp2IkfdvwHiU3pIySUzzBKxfOtO-e5PkA8TNwo,520
-ducktools/classbuilder/prefab.py,sha256=6YOVVYYeuMF5gv9DnK-sCvNKxBaBoqDXNLUQ22-xINk,24097
-ducktools/classbuilder/prefab.pyi,sha256=x2ioTpkhNjQXFeKABFOzE0xNeZ8f_W5vusmuAzE19mc,4491
-ducktools/classbuilder/py.typed,sha256=la67KBlbjXN-_-DfGNcdOcjYumVpKG_Tkw-8n5dnGB4,8
-ducktools_classbuilder-0.7.0.dist-info/LICENSE.md,sha256=6Thz9Dbw8R4fWInl6sGl8Rj3UnKnRbDwrc6jZerpugQ,1070
-ducktools_classbuilder-0.7.0.dist-info/METADATA,sha256=R5idmDAFadD3tnLKV1b1CtX937TGvjUWGUsQD6u9G6U,10917
-ducktools_classbuilder-0.7.0.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-ducktools_classbuilder-0.7.0.dist-info/top_level.txt,sha256=uSDLtio3ZFqdwcsMJ2O5yhjB4Q3ytbBWbA8rJREganc,10
-ducktools_classbuilder-0.7.0.dist-info/RECORD,,