[Checkins] SVN: five.pt/trunk/ Split out CMF bindings to separate package (cmf.pt).

Malthe Borch mborch at gmail.com
Mon Nov 24 06:40:53 EST 2008


Log message for revision 93304:
  Split out CMF bindings to separate package (cmf.pt).

Changed:
  U   five.pt/trunk/CHANGES.txt
  U   five.pt/trunk/README.txt
  U   five.pt/trunk/setup.py
  D   five.pt/trunk/src/five/pt/cmf.py
  U   five.pt/trunk/src/five/pt/configure.zcml

-=-
Modified: five.pt/trunk/CHANGES.txt
===================================================================
--- five.pt/trunk/CHANGES.txt	2008-11-24 11:40:27 UTC (rev 93303)
+++ five.pt/trunk/CHANGES.txt	2008-11-24 11:40:53 UTC (rev 93304)
@@ -4,6 +4,8 @@
 HEAD
 ----
 
+- Split out CMF-related code to separate package. [malthe]
+
 - Compatibility changes to support Zope 2.10. [malthe]
 
 five.pt 0.1 (released 11/19/2008)

Modified: five.pt/trunk/README.txt
===================================================================
--- five.pt/trunk/README.txt	2008-11-24 11:40:27 UTC (rev 93303)
+++ five.pt/trunk/README.txt	2008-11-24 11:40:53 UTC (rev 93304)
@@ -5,15 +5,13 @@
 2. It's a drop-in replacement, providing bridges to the most common
 API.
 
-Support for CMF skin templates, browser pages, viewlets and viewlet
-managers is included.
+Support for browser pages, viewlets and viewlet managers is included.
 
 Usage
 -----
 
 To enable Chameleon, simply include the ZCML configuration::
 
-  <include package="five.pt" file="meta.zcml" />
   <include package="five.pt" />
 
 Tempates may be instantiated directly. Here's an example of a browser

Modified: five.pt/trunk/setup.py
===================================================================
--- five.pt/trunk/setup.py	2008-11-24 11:40:27 UTC (rev 93303)
+++ five.pt/trunk/setup.py	2008-11-24 11:40:53 UTC (rev 93304)
@@ -1,10 +1,10 @@
 from setuptools import setup, find_packages
 
-version = '0.1'
+version = '0.2'
 
 setup(name='five.pt',
       version=version,
-      description="Five bridges and patches to use Chameleon with Zope 2 and CMF.",
+      description="Five bridges and patches to use Chameleon with Zope 2.",
       long_description=open("README.txt").read() + open("CHANGES.txt").read(),
       classifiers=[
         "Framework :: Zope2",

Deleted: five.pt/trunk/src/five/pt/cmf.py
===================================================================
--- five.pt/trunk/src/five/pt/cmf.py	2008-11-24 11:40:27 UTC (rev 93303)
+++ five.pt/trunk/src/five/pt/cmf.py	2008-11-24 11:40:53 UTC (rev 93304)
@@ -1,80 +0,0 @@
-import Globals
-
-from Products.CMFCore.FSObject import FSObject
-from Products.CMFCore import DirectoryView
-from Products.CMFCore import permissions
-
-from Products.CMFFormController.BaseControllerPageTemplate import \
-     BaseControllerPageTemplate as BaseCPT
-from Products.CMFFormController.FSControllerBase import FSControllerBase
-
-from Shared.DC.Scripts.Script import Script
-from AccessControl import ClassSecurityInfo
-from RestrictedPython import Utilities
-
-from pagetemplate import BaseTemplateFile
-
-class FSPageTemplate(BaseTemplateFile, FSObject, Script):
-    meta_type = 'Filesystem Page Template'
-    
-    security = ClassSecurityInfo()
-    security.declareObjectProtected(permissions.View)
-
-    _default_bindings = {'name_subpath': 'traverse_subpath'}
-
-    utility_builtins = Utilities.utility_builtins
-    
-    def __init__(self, id, filepath, fullname=None, properties=None):
-        FSObject.__init__(self, id, filepath, fullname, properties)
-        self.ZBindings_edit(self._default_bindings)
-
-        # instantiate page template
-        BaseTemplateFile.__init__(self, filepath)
-        
-    def _readFile(self, reparse):
-        # templates are lazy
-        if reparse:
-            self.read()
-
-    def __call__(self, *args, **kwargs):
-        kwargs['args'] = args
-        return BaseTemplateFile.__call__(self, self, **kwargs)    
-
-    @property
-    def func_code(self):
-        return self.render.func_code    
-    
-class FSControllerPageTemplate(FSPageTemplate, FSControllerBase, BaseCPT):
-    def __init__(self, id, filepath, fullname=None, properties=None):
-        FSPageTemplate.__init__(self, id, filepath, fullname, properties)  
-        self.filepath = filepath
-      
-        self._read_action_metadata(self.getId(), filepath)
-        self._read_validator_metadata(self.getId(), filepath)
-
-    def _readFile(self, reparse):
-        FSPageTemplate._readFile(self, reparse)
-        self._readMetadata()
-
-    def _updateFromFS(self):
-        # workaround for Python 2.1 multiple inheritance lameness
-        return self._baseUpdateFromFS()
-
-    def _readMetadata(self):
-        # workaround for Python 2.1 multiple inheritance lameness
-        return self._baseReadMetadata()
-
-    def __call__(self, *args, **kwargs):
-        return self._call(FSPageTemplate.__call__, *args, **kwargs)
-
-Globals.InitializeClass(FSPageTemplate)
-Globals.InitializeClass(FSControllerPageTemplate)
-
-DirectoryView.registerFileExtension('pt', FSPageTemplate)
-DirectoryView.registerFileExtension('zpt', FSPageTemplate)
-DirectoryView.registerFileExtension('html', FSPageTemplate)
-DirectoryView.registerFileExtension('htm', FSPageTemplate)
-DirectoryView.registerFileExtension('cpt', FSControllerPageTemplate)
-
-DirectoryView.registerMetaType('Page Template', FSPageTemplate)
-DirectoryView.registerMetaType('Controller Page Template', FSControllerPageTemplate)

Modified: five.pt/trunk/src/five/pt/configure.zcml
===================================================================
--- five.pt/trunk/src/five/pt/configure.zcml	2008-11-24 11:40:27 UTC (rev 93303)
+++ five.pt/trunk/src/five/pt/configure.zcml	2008-11-24 11:40:53 UTC (rev 93304)
@@ -1,10 +1,7 @@
 <configure xmlns="http://namespaces.zope.org/zope">
 
   <include package="five.pt" file="meta.zcml" />
-
-  <include package="five.pt.cmf" />
   <include package="five.pt.patches" />
-  
   <include package="z3c.pt" />
 
   <utility



More information about the Checkins mailing list