Merge branch 'release/2.1.2'

Author: GrahamDumpleton

.github/workflows/build-test-release.yml

@@ -250,18 +250,14 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, windows-11-arm, macos-15-intel, macos-latest]
-        # arch: [auto]
-        # include:
-        #   - os: ubuntu-latest
-        #     arch: aarch64
-        #   - os: macos-latest
-        #     arch: universal2
-        #   - os: ubuntu-latest
-        #     arch: riscv64
+        arch: [auto]
+        include:
+          - os: ubuntu-latest
+            arch: riscv64
     steps:
       - uses: actions/checkout@v5
       - name: Set up QEMU
-        if: ${{ matrix.arch == 'aarch64' || matrix.arch == 'riscv64' }}
+        if: ${{ matrix.arch == 'riscv64' }}
         uses: docker/setup-qemu-action@v3
       - name: Build wheels
         uses: pypa/cibuildwheel@v3.3.0

docs/changes.rst

@@ -1,6 +1,22 @@
 Release Notes
 =============
 
+Version 2.1.2
+-------------
+
+**Bugs Fixed**
+
+* Building of Python wheels for riscv64 Linux platform had been accidentally
+  removed from the build configuration. This has now been added back in.
+
+* When a weak function proxy was created for a bound method and the instance
+  it was bound to was garbage collected, calling the proxy would silently
+  call the function as unbound instead of raising a ``ReferenceError``.
+
+* When deleting an attribute named ``__annotations__`` on an object proxy, the
+  attribute was only being deleted from the proxy and not also from the wrapped
+  object.
+
 Version 2.1.1
 -------------
 

src/wrapt/__init__.py

@@ -2,7 +2,7 @@
 Wrapt is a library for decorators, wrappers and monkey patching.
 """
 
-__version_info__ = ("2", "1", "1")
+__version_info__ = ("2", "1", "2")
 __version__ = ".".join(__version_info__)
 
 from .__wrapt__ import (

src/wrapt/weakrefs.py

@@ -103,6 +103,13 @@ def _unpack_self(self, *args):
         instance = self._self_instance and self._self_instance()
         function = self.__wrapped__ and self.__wrapped__
 
+        # If the wrapped function was originally a bound method but the
+        # instance it was bound to has been garbage collected, raise a
+        # ReferenceError rather than silently calling it as unbound.
+
+        if self._self_instance is not None and instance is None:
+            raise ReferenceError("weakly-referenced object no longer exists")
+
         # If the wrapped function was originally a bound function, for
         # which we retained a reference to the instance and the unbound
         # function we need to rebind the function and then call it. If

src/wrapt/wrappers.py

@@ -283,6 +283,10 @@ def __delattr__(self, name):
             object.__delattr__(self, name)
             delattr(self.__wrapped__, name)
 
+        elif name == "__annotations__":
+            object.__delattr__(self, name)
+            delattr(self.__wrapped__, name)
+
         elif hasattr(type(self), name):
             object.__delattr__(self, name)
 

tests/core/test_update_attributes.py

@@ -74,6 +74,44 @@ def wrapper(wrapped, instance, args, kwargs):
         self.assertEqual(function.__qualname__, "override_qualname")
         self.assertEqual(instance.__qualname__, "override_qualname")
 
+    def test_delete_qualname(self):
+
+        @passthru_decorator
+        def function():
+            pass
+
+        function.__qualname__ = "override_qualname"
+
+        self.assertEqual(function.__qualname__, "override_qualname")
+
+        # CPython raises TypeError when deleting __qualname__ from a function
+        # because the C-level setter rejects a NULL value. PyPy raises
+        # AttributeError instead. Both indicate that deletion is not supported.
+        self.assertRaises(
+            (TypeError, AttributeError), delattr, function, "__qualname__"
+        )
+
+    def test_delete_qualname_modified_on_original(self):
+        def function():
+            pass
+
+        def wrapper(wrapped, instance, args, kwargs):
+            return wrapped(*args, **kwargs)
+
+        instance = wrapt.FunctionWrapper(function, wrapper)
+
+        instance.__qualname__ = "override_qualname"
+
+        self.assertEqual(function.__qualname__, "override_qualname")
+        self.assertEqual(instance.__qualname__, "override_qualname")
+
+        # CPython raises TypeError when deleting __qualname__ from a function
+        # because the C-level setter rejects a NULL value. PyPy raises
+        # AttributeError instead. Both indicate that deletion is not supported.
+        self.assertRaises(
+            (TypeError, AttributeError), delattr, instance, "__qualname__"
+        )
+
     def test_update_module(self):
         @passthru_decorator
         def function():
@@ -160,6 +198,40 @@ def wrapper(wrapped, instance, args, kwargs):
         self.assertEqual(function.__annotations__, override_annotations)
         self.assertEqual(instance.__annotations__, override_annotations)
 
+    def test_delete_annotations(self):
+        @passthru_decorator
+        def function():
+            pass
+
+        override_annotations = {"override_annotations": ""}
+        function.__annotations__ = override_annotations
+
+        self.assertEqual(function.__annotations__, override_annotations)
+
+        del function.__annotations__
+
+        self.assertEqual(function.__annotations__, {})
+
+    def test_delete_annotations_modified_on_original(self):
+        def function():
+            pass
+
+        def wrapper(wrapped, instance, args, kwargs):
+            return wrapped(*args, **kwargs)
+
+        instance = wrapt.FunctionWrapper(function, wrapper)
+
+        override_annotations = {"override_annotations": ""}
+        instance.__annotations__ = override_annotations
+
+        self.assertEqual(function.__annotations__, override_annotations)
+        self.assertEqual(instance.__annotations__, override_annotations)
+
+        del instance.__annotations__
+
+        self.assertEqual(function.__annotations__, {})
+        self.assertEqual(instance.__annotations__, {})
+
 
 if __name__ == "__main__":
     unittest.main()

tests/core/test_weak_function_proxy.py

@@ -1,5 +1,5 @@
-import unittest
 import gc
+import unittest
 
 import wrapt
 
@@ -82,6 +82,9 @@ def callback(proxy):
         self.assertEqual(len(result), 1)
         self.assertEqual(id(proxy), result[0])
 
+        with self.assertRaises(ReferenceError):
+            proxy(1, 2)
+
     def test_instancemethod_delete_function(self):
         class Class:
             def function(self, a, b):
@@ -105,6 +108,9 @@ def callback(proxy):
         self.assertEqual(len(result), 1)
         self.assertEqual(id(proxy), result[0])
 
+        with self.assertRaises(ReferenceError):
+            proxy(1, 2)
+
     def test_instancemethod_delete_function_and_instance(self):
         class Class:
             def function(self, a, b):
@@ -128,6 +134,9 @@ def callback(proxy):
         self.assertEqual(len(result), 1)
         self.assertEqual(id(proxy), result[0])
 
+        with self.assertRaises(ReferenceError):
+            proxy(1, 2)
+
     def test_classmethod(self):
         class Class:
             @classmethod
@@ -151,6 +160,9 @@ def callback(proxy):
         self.assertEqual(len(result), 1)
         self.assertEqual(id(proxy), result[0])
 
+        with self.assertRaises(ReferenceError):
+            proxy(1, 2)
+
     def test_staticmethod(self):
         class Class:
             @staticmethod