Changeset 1981 in products for quintagroup.catalogupdater/trunk

Timestamp:

Mar 24, 2010 9:52:44 AM (14 years ago)

Author:

fenix

Message:

some code refactoring, made compatible with plone4

Location:

quintagroup.catalogupdater/trunk/quintagroup/catalogupdater

Files:

• exportimport/tests/test_catalogupdate.py (modified) (3 diffs)
• utility.py (modified) (2 diffs)

quintagroup.catalogupdater/trunk/quintagroup/catalogupdater/exportimport/tests/test_catalogupdate.py

@@ -15 +15 @@
 from quintagroup.catalogupdater.interfaces import ICatalogUpdater
 
+from Products.CMFPlone.utils import getFSVersionTuple
+PLONEFOUR = getFSVersionTuple()[0] == 4 and True or False
+
 _CATALOG_BODY = test_exportimport._CATALOG_BODY
 _ZCTEXT_XML = test_exportimport._ZCTEXT_XML
@@ -21 +24 @@
 <?xml version="1.0"?>
 <object name="foo_catalog">
- <object name="foo_vocabulary" remove="True"/>
+ %s
  <index name="foo_text" remove="True"/>
  <index name="foo_text" meta_type="ZCTextIndex">
@@ -34 +37 @@
  <column value="spam" update="True"/>
 </object>
-"""
+""" % (PLONEFOUR and '<object name="old_plexicon" remove="True"/>' or \
+                     '<object name="foo_vocabulary" remove="True"/>')
+             
 
 

quintagroup.catalogupdater/trunk/quintagroup/catalogupdater/utility.py

@@ -12 +12 @@
 from Products.ZCatalog.Catalog import safe_callable
 
-
 try:
     from plone.indexer.interfaces import IIndexableObject
 except ImportError:
-    class IIndexableObject:pass
     from plone.app.content.interfaces import IIndexableObjectWrapper \
         as _old_IIndexableObjectWrapper
-    from plone.app.content.interfaces import IIndexableObjectWrapper
-
-    register_bbb_indexers = lambda:None
-
     IS_NEW = False
 else:    
-    from Products.CMFPlone.CatalogTool import register_bbb_indexers
-    from Products.CMFPlone.CatalogTool import _old_IIndexableObjectWrapper
-
     IS_NEW = True
 
@@ -64 +55 @@
     def getWrappedObjectNew(self, obj, portal, catalog):
         # Returned wrapped 'obj' object with IIndexable wrapper
-        w = obj
+        wrapper = None
         if not IIndexableObject.providedBy(obj):
-             # BBB: Compatibility wrapper lookup. Should be removed in Plone 4.
-             register_bbb_indexers()
-             wrapper = queryMultiAdapter((obj, portal), _old_IIndexableObjectWrapper)
-             if wrapper is not None:
-                 w = wrapper
-             else:
-                 # This is the CMF 2.2 compatible approach, which should be used going forward
-                 wrapper = queryMultiAdapter((obj, catalog), IIndexableObject)
-                 if wrapper is not None:
-                     w = wrapper
-        return w
-
+             # This is the CMF 2.2 compatible approach, which should be used going forward
+             wrapper = queryMultiAdapter((obj, catalog), IIndexableObject)
+        return wrapper and wrapper or obj
 
     def getWrappedObjectOld(self, obj, portal, catalog):