Merge pull request #2 from plone/plonezope4

Merge Zope 4 fixes

Products/CMFUid/CHANGES.txt

@@ -4,6 +4,12 @@ Products.CMFUid Changelog
 2.3.0 (unreleased)
 ------------------
 
+- Fix import for compatibility with Zope 4.
+
+- Adapt tests to the new indexing operations queueing.
+  Part of PLIP 1343: https://github.com/plone/Products.CMFPlone/issues/1343
+  [gforcada]
+
 
 2.3.0-beta (2012-03-21)
 -----------------------

Products/CMFUid/UniqueIdAnnotationTool.py

@@ -26,11 +26,11 @@
 from zope.container.interfaces import IObjectAddedEvent
 from zope.interface import implements
 
+from Products.CMFCore.utils import getToolByName
 from Products.CMFCore.utils import registerToolInterface
 from Products.CMFCore.utils import UniqueObject
 from Products.CMFUid.interfaces import IUniqueIdAnnotation
 from Products.CMFUid.interfaces import IUniqueIdAnnotationManagement
-from Products.CMFUid.interfaces import IUniqueIdHandler
 from Products.CMFUid.interfaces import UniqueIdError
 
 
@@ -73,7 +73,7 @@ def handleUidAnnotationEvent(ob, event):
     if IObjectAddedEvent.providedBy(event):
         if event.newParent is not None:
             anno_tool = queryUtility(IUniqueIdAnnotationManagement)
-            uidtool = queryUtility(IUniqueIdHandler)
+            uidtool = getToolByName(ob, 'portal_uidhandler', None)
             if anno_tool is not None:
                 remove_on_add = anno_tool.getProperty('remove_on_add', False)
                 remove_on_clone = anno_tool.getProperty('remove_on_clone', False)
@@ -91,7 +91,7 @@ def handleUidAnnotationEvent(ob, event):
 
     elif IObjectClonedEvent.providedBy(event):
         anno_tool = queryUtility(IUniqueIdAnnotationManagement)
-        uidtool = queryUtility(IUniqueIdHandler)
+        uidtool = getToolByName(ob, 'portal_uidhandler', None)
 
         if anno_tool is not None:
             remove_on_clone = anno_tool.getProperty('remove_on_clone', False)

Products/CMFUid/UniqueIdHandlerTool.py

@@ -28,8 +28,8 @@
 from zope.component import getUtility
 from zope.interface import implements
 
-from Products.CMFCore.interfaces import ICatalogTool
 from Products.CMFCore.permissions import ManagePortal
+from Products.CMFCore.utils import getToolByName
 from Products.CMFCore.utils import registerToolInterface
 from Products.CMFCore.utils import UniqueObject
 from Products.CMFUid.interfaces import IUniqueIdAnnotationManagement
@@ -70,7 +70,7 @@ class UniqueIdHandlerTool(UniqueObject, SimpleItem):
     security = ClassSecurityInfo()
 
     def _reindexObject(self, obj):
-        ctool = getUtility(ICatalogTool)
+        ctool = getToolByName(self, 'portal_catalog')
         ctool.reindexObject(obj, idxs=[self.UID_ATTRIBUTE_NAME])
 
     def _setUid(self, obj, uid):
@@ -167,7 +167,7 @@ def _queryBrain(self, uid, searchMethodName, default=None):
         generator = getUtility(IUniqueIdGenerator)
         uid = generator.convert(uid)
 
-        ctool = getUtility(ICatalogTool)
+        ctool = getToolByName(self, 'portal_catalog')
         searchMethod = getattr(ctool, searchMethodName)
         result = searchMethod({self.UID_ATTRIBUTE_NAME: uid})
         len_result = len(result)

Products/CMFUid/__init__.py

@@ -13,6 +13,7 @@
 """Unique id generation and handling.
 """
 
+
 def initialize(context):
 
     from Products.CMFCore import utils
@@ -21,14 +22,14 @@ def initialize(context):
     import UniqueIdGeneratorTool
     import UniqueIdHandlerTool
 
-
     tools = (
         UniqueIdAnnotationTool.UniqueIdAnnotationTool,
         UniqueIdGeneratorTool.UniqueIdGeneratorTool,
         UniqueIdHandlerTool.UniqueIdHandlerTool,
     )
 
-    utils.ToolInit( 'CMF Unique Id Tool'
-                  , tools=tools
-                  , icon='tool.gif'
-                  ).initialize(context)
+    utils.ToolInit(
+        'CMF Unique Id Tool',
+        tools=tools,
+        icon='tool.gif'
+    ).initialize(context)

Products/CMFUid/testing.py

@@ -24,9 +24,10 @@ class UidEventZCMLLayer(ZopeLite):
     @classmethod
     def testSetUp(cls):
         import Products
+        import OFS
 
         zcml.load_config('meta.zcml', Products.Five)
-        zcml.load_config('event.zcml', Products.Five)
+        zcml.load_config('event.zcml', OFS)
         zcml.load_config('event.zcml', Products.CMFUid)
         setHooks()
 

Products/CMFUid/tests/test_uidhandling.py

@@ -13,19 +13,22 @@
 """Test the unique id handling.
 """
 
-import unittest
-import Testing
-
-from zope.component import getSiteManager
-from zope.interface.verify import verifyClass
-from zope.testing.cleanup import cleanUp
-
 from Products.CMFCore.interfaces import ICatalogTool
 from Products.CMFCore.tests.base.dummy import DummyContent
 from Products.CMFCore.tests.base.dummy import DummyFolder
 from Products.CMFCore.tests.base.testcase import SecurityTest
 from Products.CMFUid.interfaces import IUniqueIdAnnotationManagement
 from Products.CMFUid.interfaces import IUniqueIdGenerator
+from Testing import ZopeTestCase
+from zope.component import getSiteManager
+from zope.interface.verify import verifyClass
+from zope.testing.cleanup import cleanUp
+
+
+ZopeTestCase.installProduct('PluginIndexes')
+
+from Products.CMFCore.indexing import PortalCatalogProcessor
+from Products.CMFCore.interfaces import IPortalCatalogQueueProcessor
 
 
 class DummyUid:
@@ -36,7 +39,7 @@ class DummyUid:
 
 class DummyContent(DummyContent):
     """Objects may return non-ASCII when converted to str.
-    
+
     Think File and Image.
     """
     def __str__(self):
@@ -55,11 +58,12 @@ def _makeOne(self, *args, **kw):
 
     def setUp(self):
         from Products.CMFCore.CatalogTool import CatalogTool
+        from Products.CMFCore.utils import registerToolInterface
         from Products.CMFUid.interfaces import IUniqueIdHandler
         from Products.CMFUid.UniqueIdAnnotationTool \
-                import UniqueIdAnnotationTool
+            import UniqueIdAnnotationTool
         from Products.CMFUid.UniqueIdGeneratorTool \
-                import UniqueIdGeneratorTool
+            import UniqueIdGeneratorTool
 
         SecurityTest.setUp(self)
         self.app._setObject('dummy', DummyContent(id='dummy'))
@@ -68,10 +72,12 @@ def setUp(self):
         self.uidhandler = self._makeOne()
         sm = getSiteManager()
         sm.registerUtility(self.ctool, ICatalogTool)
+        registerToolInterface('portal_catalog', ICatalogTool)
         sm.registerUtility(self.uidhandler, IUniqueIdHandler)
         sm.registerUtility(UniqueIdAnnotationTool(),
                            IUniqueIdAnnotationManagement)
         sm.registerUtility(UniqueIdGeneratorTool(), IUniqueIdGenerator)
+        sm.registerUtility(provided=IPortalCatalogQueueProcessor, factory=PortalCatalogProcessor)
 
         # Make sure we have our indices/columns
         uid_name = self.uidhandler.UID_ATTRIBUTE_NAME
@@ -287,9 +293,3 @@ def test_UidCatalogingDoesNotCatalogPortalRoot(self):
         uid = handler.register(dummy)
         brains = catalog(cmf_uid=uid)
         self.assertEqual(len(brains), 0)
-
-
-def test_suite():
-    return unittest.TestSuite((
-        unittest.makeSuite(UniqueIdHandlerTests),
-        ))

Products/CMFUid/version.txt

@@ -1 +1 @@
-2.3.0dev
+2.3.0.dev0