Changeset 1855 in products

Timestamp:

Mar 5, 2010 4:15:24 PM (14 years ago)

Author:

mylan

Message:

#156: Refuse from stright depending from IPropertyManager interface and leave only ITraversable one, update adapter registration

Location:

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer

Files:

• adapters.py (modified) (3 diffs)
• adapters.zcml (modified) (1 diff)

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/adapters.py

@@ -6 +6 @@
 
 from Acquisition import aq_inner
+from OFS.interfaces import IPropertyManager
 from Products.CMFCore.utils import getToolByName
 
@@ -75 +76 @@
 
     def __init__(self, context):
-        self.context = context
+        self.context = aq_inner(context)
 
     def canonical_path(self):
@@ -81 +82 @@
 
         # Calculate canonical path from qSEO_canonical property
-        prop = aq_inner(self.context).getProperty('qSEO_canonical', None)
-        if prop is not None:
-            return prop[len(purl()):]
-        
+        if IPropertyManager.providedBy(self.context):
+            prop = self.context.getProperty('qSEO_canonical', None)
+            if prop is not None:
+                return prop[len(purl()):]
+
         # Fallback for canonical path calculation
         return '/'+'/'.join(purl.getRelativeContentPath(self.context))

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/adapters.zcml

@@ -15 +15 @@
       />
 
-  <!-- really adapter depends on both interfaces
-       *IPropertyManager* AND *ITreversable*
-       Actually only IFolder directly implements
-       both, but IItem not.
-  -->
-  <adapter
-      for="OFS.interfaces.IFolder"
-      provides=".interfaces.ISEOCanonicalPath"
-      factory=".adapters.canonicalPathAdapter"
-      />
 
   <adapter
-      for="OFS.interfaces.IItem"
+      for="OFS.interfaces.ITraversable"
       provides=".interfaces.ISEOCanonicalPath"
       factory=".adapters.canonicalPathAdapter"