gh-104533: Fix `@ctypes.util.struct` with string annotations (#154040)

Fix `@ctypes.util.struct` on structures declared in a module which uses
`from __future__ import annotations`. The decorator now calls
get_annotations() with eval_str=True.

diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
index c65fc3032fdfad4833e0342f1a2b20d016a60478..e8db8c578bb36014235352d2c047128ed6b899a6 100644 (file)
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -512,7 +512,8 @@ def _process_struct(decorated_class, /, *, align, layout, endian, pack):
         fields.extend(decorated_class._fields_)
         anonymous.extend(decorated_class._anonymous_)
 
-    for name, hint in annotationlib.get_annotations(decorated_class).items():
+    annotations = annotationlib.get_annotations(decorated_class, eval_str=True)
+    for name, hint in annotations.items():
         if get_origin(hint) is ClassVar:
             continue
 

diff --git a/Lib/test/test_ctypes/struct_str_ann.py b/Lib/test/test_ctypes/struct_str_ann.py
new file mode 100644 (file)
index 0000000..7a92482
--- /dev/null
+++ b/Lib/test/test_ctypes/struct_str_ann.py
@@ -0,0 +1,15 @@
+from __future__ import annotations
+from ctypes.util import struct
+from ctypes import c_int
+
+class TestAnn:
+    x: c_int
+
+# Check that "from __future__ import annotations" works as expected
+if not isinstance(TestAnn.__annotations__['x'], str):
+    raise Exception("annotations must be strings")
+
+@struct
+class Point:
+    x: c_int
+    y: c_int

diff --git a/Lib/test/test_ctypes/test_structures.py b/Lib/test/test_ctypes/test_structures.py
index 4dc1ea867c0700abd2faf3cc8720a486c00b2bef..04c3682e8308ecee1bcdb093bc1faefa063f8dce 100644 (file)
--- a/Lib/test/test_ctypes/test_structures.py
+++ b/Lib/test/test_ctypes/test_structures.py
@@ -88,13 +88,14 @@ class StructureTestCase(unittest.TestCase, StructCheckMixin):
         self.assertEqual(sizeof(X), min(8, longlong_align) + longlong_size)
         self.assertEqual(X.b.offset, min(8, longlong_align))
 
-        with self.assertRaises(ValueError):
-            if use_struct_util:
+        if use_struct_util:
+            with self.assertRaises(NameError):
                 @struct_util(pack=-1, layout='ms')
                 class X:
                     a: "b"
                     b: "q"
-            else:
+        else:
+            with self.assertRaises(ValueError):
                 class X(Structure):
                     _fields_ = [("a", "b"), ("b", "q")]
                     _pack_ = -1
@@ -954,6 +955,12 @@ class StructureTestCase(unittest.TestCase, StructCheckMixin):
 
         self.assertEqual(Foo.__name__, "Foo")
 
+    def test_string_annotations(self):
+        from test.test_ctypes import struct_str_ann
+        Point = struct_str_ann.Point
+        fields = [['x', c_int], ['y', c_int]]
+        self.assertEqual(Point._fields_, fields)
+
 
 if __name__ == '__main__':
     unittest.main()