Merge f43241d into a449b8c

CHANGES.rst

@@ -10,6 +10,10 @@ https://zope.readthedocs.io/en/2.13/CHANGES.html
 4.5.2 (unreleased)
 ------------------
 
+- Provide a more senseful ``OFS.SimpleItem.Item_w__name__.id``
+  to avoid bugs by use of deprecated direct ``id`` access
+  (as e.g. (`#903 <https://github.com/zopefoundation/Zope/issues/903>`_).
+
 - Update dependencies to the latest releases that still support Python 2.
 
 - Update to ``zope.interface > 5.1.0`` to fix a memory leak.

src/OFS/SimpleItem.py

@@ -446,6 +446,10 @@ def getId(self):
         """
         return self.__name__
 
+    # Alias (deprecated) `id` to `getId()` (but avoid recursion)
+    id = ComputedAttribute(
+        lambda self: self.getId() if "__name__" in self.__dict__ else "")
+
     def title_or_id(self):
         """Return the title if it is not blank and the id otherwise.
         """

src/OFS/tests/testSimpleItem.py

@@ -79,6 +79,17 @@ def test_interfaces(self):
 
         verifyClass(IItemWithName, Item_w__name__)
 
+    def test_id(self):
+        from OFS.SimpleItem import Item_w__name__
+        itm = Item_w__name__()
+        # fall back to inherited `id`
+        self.assertEqual(itm.id, "")
+        itm.id = "id"
+        self.assertEqual(itm.id, "id")
+        del itm.id
+        itm._setId("name")
+        self.assertEqual(itm.id, "name")
+
 
 class TestSimpleItem(unittest.TestCase):