Changeset 1685 in products

Timestamp:

Feb 10, 2010 12:21:38 PM (15 years ago)

Author:

mylan

Message:

Fix deprication warining in catalog index registration

Location:

quintagroup.canonicalpath/trunk/quintagroup/canonicalpath

Files:

• catalog.py (modified) (2 diffs)
• configure.zcml (modified) (1 diff)

quintagroup.canonicalpath/trunk/quintagroup/canonicalpath/catalog.py

@@ +1 @@
+from zope.interface import Interface
 from zope.component import queryAdapter
-from Products.CMFPlone.CatalogTool import registerIndexableAttribute
+from plone.indexer.decorator import indexer
 
 from interfaces import ICanonicalPath
 
-
-def canonical_path(obj, portal, **kwargs):
+@indexer(Interface)
+def canonical_path(obj, **kwargs):
     """Return canonical_path property for the object.
     """
@@ -12 +13 @@
         return cpath.canonical_path()
     return None
-
-registerIndexableAttribute('canonical_path', canonical_path)

quintagroup.canonicalpath/trunk/quintagroup/canonicalpath/configure.zcml

@@ -7 +7 @@
   <include package="archetypes.schemaextender" />
 
-  <adapter
-        factory=".adapters.canonicalPathAdapter"
-        />
+  <adapter factory=".adapters.canonicalPathAdapter" />
+
+  <adapter name="canonical_path" factory=".catalog.canonical_path" />
 
   <genericsetup:registerProfile