[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ Adaptation moved to class definition

[Charlie Clark]

Log message for revision 117201:
  Adaptation moved to class definition

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/SyndicationInfo.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/configure.zcml

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/SyndicationInfo.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/SyndicationInfo.py	2010-10-03 17:03:11 UTC (rev 117200)
+++ Products.CMFDefault/trunk/Products/CMFDefault/SyndicationInfo.py	2010-10-03 17:31:58 UTC (rev 117201)
@@ -1,8 +1,10 @@
 from OFS.SimpleItem import SimpleItem
 
-from zope.interface import alsoProvides, noLongerProvides
+from zope.component import adapts
+from zope.interface import implements, alsoProvides, noLongerProvides
 
-from Products.CMFCore.interfaces import ISyndicatable
+from Products.CMFCore.interfaces import (ISyndicatable, ISyndicationInfo,
+    IFolderish)
 from Products.CMFCore.utils import getToolByName
 
 
@@ -25,6 +27,8 @@
     _syndication_info attribute of the folder
     """
     
+    implements(ISyndicationInfo)
+    adapts(IFolderish)
     key = "_syndication_info"
     
     def __init__(self, context):

Modified: Products.CMFDefault/trunk/Products/CMFDefault/configure.zcml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/configure.zcml	2010-10-03 17:03:11 UTC (rev 117200)
+++ Products.CMFDefault/trunk/Products/CMFDefault/configure.zcml	2010-10-03 17:31:58 UTC (rev 117201)
@@ -21,8 +21,6 @@
   
   <adapter
       factory = ".SyndicationInfo.SyndicationInfo"
-      for = "Products.CMFCore.interfaces.IFolderish"
-      provides = "Products.CMFCore.interfaces.ISyndicationInfo"
       />
 
 </configure>