- fixed TypeError handling in unrestrictedTraverse

doc/CHANGES.rst

@@ -8,6 +8,8 @@ http://docs.zope.org/zope2/releases/.
 2.13.16 (unreleased)
 --------------------
 
+- OFS: Fixed TypeError handling in unrestrictedTraverse.
+
 - Updated distributions:
 
   - AccessControl = 2.13.8

src/OFS/Traversable.py

@@ -260,9 +260,10 @@ class Traversable:
                                     if isinstance(next, NullResource):
                                         resource = next
                                         raise KeyError(name)
-                                except AttributeError:
+                                except (AttributeError, TypeError):
                                     # Raise NotFound for easier debugging
                                     # instead of AttributeError: __getitem__
+                                    # or TypeError: not subscriptable
                                     raise NotFound(name)
                                 if restricted and not validate(
                                     obj, obj, None, next):

src/OFS/tests/testTraverse.py

@@ -402,6 +402,20 @@ class TestTraverse( unittest.TestCase ):
         self.assertEqual(
             self.root.folder1.restrictedTraverse('stuff', 42), 42)
 
+    def testNotFoundIsRaised(self):
+        from OFS.SimpleItem import SimpleItem
+        from zExceptions import NotFound
+        from operator import getitem
+        self.folder1._setObject('foo', SimpleItem('foo'))
+        self.assertRaises(AttributeError, getitem, self.folder1.foo,
+                          'doesntexist')
+        self.assertRaises(NotFound, self.folder1.unrestrictedTraverse,
+                          'foo/doesntexist')
+        self.assertRaises(TypeError, getitem,
+                          self.folder1.foo.isPrincipiaFolderish, 'doesntexist')
+        self.assertRaises(NotFound, self.folder1.unrestrictedTraverse,
+                          'foo/isPrincipiaFolderish/doesntexist')
+
     def testDefaultValueWhenNotFound(self):
         # Test that traversing to a non-existent object returns
         # the default when provided