[CMF-checkins] CVS: CMF/CMFCore - CachingPolicyManager.py:1.3 FSPageTemplate.py:1.8

[Tres Seaver]

Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv5155/CMFCore

Modified Files:
	CachingPolicyManager.py FSPageTemplate.py 
Log Message:


  - Issues noted by Florent Guillaume:

    o CachingPolicyManager: Aliased interface to remove name clash between
      interface and implemenation class for CachingPolicyManager.

    o FSPageTemplate:  Removed duplicated return statement, left from
      merge / conflict resolution.

  - Added interface test for CPM.


=== CMF/CMFCore/CachingPolicyManager.py 1.2 => 1.3 ===
 
 from Products.CMFCore.interfaces.CachingPolicyManager \
-        import CachingPolicyManager
+        import CachingPolicyManager as ICachingPolicyManager
 
 from Products.CMFCore.ActionProviderBase import ActionProviderBase
 from Products.CMFCore.CMFCorePermissions import View
@@ -218,7 +218,7 @@
         to them from skin methods.
     """
 
-    __implements__ = CachingPolicyManager
+    __implements__ = ICachingPolicyManager
 
     id = 'caching_policy_manager'
     meta_type = 'CMF Caching Policy Manager'


=== CMF/CMFCore/FSPageTemplate.py 1.7 => 1.8 ===
             return FSPageTemplate.inheritedAttribute('pt_render')( self,
                     source, extra_context )
-            return FSPageTemplate.inheritedAttribute('pt_render')(
-                self, source, extra_context )
+
         except RuntimeError:
             if Globals.DevelopmentMode:
                 err = FSPageTemplate.inheritedAttribute( 'pt_errors' )( self )