ducktools-classbuilder 0.7.3__tar.gz → 0.7.5__tar.gz

{ducktools_classbuilder-0.7.3 → ducktools_classbuilder-0.7.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ducktools-classbuilder
-Version: 0.7.3
+Version: 0.7.5
 Summary: Toolkit for creating class boilerplate generators
 Author: David C Ellis
 License: MIT License

{ducktools_classbuilder-0.7.3 → ducktools_classbuilder-0.7.5}/src/ducktools/classbuilder/__init__.py

@@ -654,11 +654,6 @@ class Field(metaclass=SlotMakerMeta):
                 f"{cls_name} cannot define both a default value and a default factory."
             )
 
-        if self.kw_only and not self.init:
-            raise AttributeError(
-                f"{cls_name} cannot be keyword only if it is not in init."
-            )
-
     @classmethod
     def from_field(cls, fld, /, **kwargs):
         """

ducktools_classbuilder-0.7.5/src/ducktools/classbuilder/_version.py

@@ -0,0 +1,2 @@
+__version__ = "0.7.5"
+__version_tuple__ = (0, 7, 5)

{ducktools_classbuilder-0.7.3 → ducktools_classbuilder-0.7.5}/src/ducktools/classbuilder/annotations.py

@@ -24,19 +24,6 @@ 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 _Stringlike(str):
     # There are typing operators that are not supported by strings
     # This adds the 'or' operator '|'
@@ -142,69 +129,6 @@ 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)
-
-    # Convert _Stringlike back to str
-    annos = {
-        k: str(v) if isinstance(v, _Stringlike) else v
-        for k, v in new_annotate(1).items()
-    }
-
-    return annos
-
-
 def get_ns_annotations(ns, eval_str=True):
     """
     Given a class namespace, attempt to retrieve the
@@ -221,10 +145,16 @@ def get_ns_annotations(ns, eval_str=True):
 
     # 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.
+    # This is disabled if __future__ annotations are used, however.
     annotate = ns.get("__annotate__")
 
     if annotate is not None:
-        raw_annotations = call_annotate_func(annotate)
+        try:
+            raw_annotations = annotate(1)  # VALUE call
+        except (NameError, AttributeError):
+            # Slow path, only used if annotations can't be evaluated.
+            from annotationlib import Format, call_annotate_function
+            raw_annotations = call_annotate_function(annotate, format=Format.FORWARDREF)
     else:
         raw_annotations = ns.get("__annotations__", {})
 

{ducktools_classbuilder-0.7.3 → ducktools_classbuilder-0.7.5}/src/ducktools/classbuilder/annotations.pyi

@@ -9,11 +9,6 @@ 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.3 → ducktools_classbuilder-0.7.5}/src/ducktools_classbuilder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ducktools-classbuilder
-Version: 0.7.3
+Version: 0.7.5
 Summary: Toolkit for creating class boilerplate generators
 Author: David C Ellis
 License: MIT License

{ducktools_classbuilder-0.7.3 → ducktools_classbuilder-0.7.5}/src/ducktools_classbuilder.egg-info/SOURCES.txt

@@ -79,7 +79,6 @@ tests/prefab/shared/examples/inheritance.py
 tests/prefab/shared/examples/init_ex.py
 tests/prefab/shared/examples/kw_only.py
 tests/prefab/shared/examples/repr_func.py
-tests/prefab/shared/examples/fails/creation_1.py
 tests/prefab/shared/examples/fails/creation_2.py
 tests/prefab/shared/examples/fails/creation_3.py
 tests/prefab/shared/examples/fails/creation_5.py

{ducktools_classbuilder-0.7.3 → ducktools_classbuilder-0.7.5}/tests/prefab/shared/test_creation.py

@@ -144,15 +144,6 @@ class TestClassVar:
 
 
 class TestExceptions:
-    def test_kw_not_in_init(self):
-        with pytest.raises(AttributeError) as e_info:
-            from fails.creation_1 import Construct
-
-        assert (
-            e_info.value.args[0]
-            == "Attribute cannot be keyword only if it is not in init."
-        )
-
     def test_positional_after_kw_error(self):
         with pytest.raises(SyntaxError) as e_info:
             from fails.creation_2 import FailSyntax

{ducktools_classbuilder-0.7.3 → ducktools_classbuilder-0.7.5}/tests/py314_tests/test_forwardref_annotations.py

@@ -1,6 +1,7 @@
 # Bare forwardrefs only work in 3.14 or later
 
 from ducktools.classbuilder.annotations import get_ns_annotations
+from annotationlib import ForwardRef
 
 from pathlib import Path
 
@@ -14,7 +15,7 @@ def test_bare_forwardref():
 
     annos = get_ns_annotations(Ex.__dict__)
 
-    assert annos == {'a': str, 'b': Path, 'c': "plain_forwardref"}
+    assert annos == {'a': str, 'b': Path, 'c': ForwardRef("plain_forwardref")}
 
 
 def test_inner_outer_ref():
@@ -37,7 +38,7 @@ def test_inner_outer_ref():
     cls, annos = make_func()
 
     # Forwardref given as string if used before it can be evaluated
-    assert annos == {"a_val": str, "b_val": int, "c_val": "hyper_type"}
+    assert annos == {"a_val": str, "b_val": int, "c_val": ForwardRef("hyper_type")}
 
     # Correctly evaluated if it exists
     assert get_ns_annotations(cls.__dict__) == {

ducktools_classbuilder-0.7.3/src/ducktools/classbuilder/_version.py

@@ -1,2 +0,0 @@
-__version__ = "0.7.3"
-__version_tuple__ = (0, 7, 3)

ducktools_classbuilder-0.7.3/tests/prefab/shared/examples/fails/creation_1.py

@@ -1,6 +0,0 @@
-from ducktools.classbuilder.prefab import prefab, attribute
-
-
-@prefab
-class Construct:
-    x = attribute(default="test", kw_only=True, init=False)