Add back FindSupport mix-in to OFS Application and Folder.

src/OFS/Application.py

@@ -28,6 +28,7 @@ from App import FactoryDispatcher
 from App.ProductContext import ProductContext
 from DateTime import DateTime
 from OFS import bbb
+from OFS.FindSupport import FindSupport
 from OFS.metaconfigure import get_packages_to_initialize
 from OFS.metaconfigure import package_initialized
 from OFS.userfolder import UserFolder
@@ -53,7 +54,7 @@ APP_MANAGER = None
 
 
 @implementer(IApplication)
-class Application(ApplicationDefaultPermissions, Folder.Folder):
+class Application(ApplicationDefaultPermissions, Folder.Folder, FindSupport):
     """Top-level system object"""
 
     security = ClassSecurityInfo()

src/OFS/FindSupport.py

@@ -36,6 +36,7 @@ import collections
 class FindSupport(Base):
     """Find support for Zope Folders"""
 
+    manage_options = ()
     security = ClassSecurityInfo()
 
     security.declareProtected(view_management_screens, 'ZopeFind')

src/OFS/Folder.py

@@ -20,6 +20,7 @@ from App.special_dtml import DTMLFile
 from zope.interface import implementer
 
 from OFS import bbb
+from OFS.FindSupport import FindSupport
 from OFS.interfaces import IFolder
 from OFS.Lockable import LockableItem
 from OFS.ObjectManager import ObjectManager
@@ -57,7 +58,8 @@ class Folder(
         RoleManager,
         Collection,
         LockableItem,
-        Item):
+        Item,
+        FindSupport):
 
     """Folders are basic container objects that provide a standard
     interface for object management. Folder objects also implement

src/OFS/PropertyManager.py

@@ -83,7 +83,7 @@ class PropertyManager(Base):
     security.setPermissionDefault(access_contents_information,
                                   ('Anonymous', 'Manager'))
 
-    manage_options = tuple()
+    manage_options = ()
 
     title = ''
     _properties = (

src/OFS/interfaces.py

@@ -922,7 +922,8 @@ class IPropertyManager(Interface):
         """Delete one or more properties specified by 'ids'."""
 
 
-class IFolder(IObjectManager, IPropertyManager, IRoleManager, IItem):
+class IFolder(IObjectManager, IPropertyManager, IRoleManager,
+              IItem, IFindSupport):
     """Folders are basic container objects that provide a standard
     interface for object management. Folder objects also implement a
     management interface and can have arbitrary properties.