r13476 - in Products.PortalTransforms/branches/1.6: . Products/PortalTransforms Products/PortalTransforms/transforms docs

Author: davisagli
Date: Wed Feb 16 07:03:44 2011
New Revision: 13476

Modified:
   Products.PortalTransforms/branches/1.6/   (props changed)
   Products.PortalTransforms/branches/1.6/Products/PortalTransforms/Transform.py
   Products.PortalTransforms/branches/1.6/Products/PortalTransforms/TransformEngine.py
   Products.PortalTransforms/branches/1.6/Products/PortalTransforms/transforms/safe_html.py   (props changed)
   Products.PortalTransforms/branches/1.6/docs/HISTORY.txt
Log:
merge r13475 from trunk

Modified: Products.PortalTransforms/branches/1.6/Products/PortalTransforms/Transform.py
==============================================================================
--- Products.PortalTransforms/branches/1.6/Products/PortalTransforms/Transform.py	(original)
+++ Products.PortalTransforms/branches/1.6/Products/PortalTransforms/Transform.py	Wed Feb 16 07:03:44 2011
@@ -184,9 +184,9 @@
             self._load_transform()
         return self._v_transform.__doc__
 
-    security.declarePublic('get_documentation')
+    security.declarePublic('convert')
     def convert(self, *args, **kwargs):
-        """ return apply the transform and return the result """
+        # return apply the transform and return the result
         if not hasattr(self, '_v_transform'):
             self._load_transform()
         return self._v_transform.convert(*args, **kwargs)

Modified: Products.PortalTransforms/branches/1.6/Products/PortalTransforms/TransformEngine.py
==============================================================================
--- Products.PortalTransforms/branches/1.6/Products/PortalTransforms/TransformEngine.py	(original)
+++ Products.PortalTransforms/branches/1.6/Products/PortalTransforms/TransformEngine.py	Wed Feb 16 07:03:44 2011
@@ -79,6 +79,7 @@
 
     # mimetype oriented conversions (iengine interface) ########################
 
+    security.declarePrivate('unregisterTransform')
     def unregisterTransform(self, name):
         """ unregister a transform
         name is the name of a registered transform
@@ -87,7 +88,7 @@
         if name in self.objectIds():
             self._delObject(name)
 
-
+    security.declarePrivate('convertTo')
     def convertTo(self, target_mimetype, orig, data=None, object=None,
                   usedby=None, context=None, **kwargs):
         """Convert orig to a given mimetype
@@ -193,9 +194,8 @@
     security.declarePublic('convertToData')
     def convertToData(self, target_mimetype, orig, data=None, object=None,
                       usedby=None, context=None, **kwargs):
-        """Convert to a given mimetype and return the raw data
-        ignoring subobjects. see convertTo for more information
-        """
+        # Convert to a given mimetype and return the raw data
+        # ignoring subobjects. see convertTo for more information
         data =self.convertTo(target_mimetype, orig, data, object, usedby,
                        context, **kwargs)
         if data:
@@ -204,12 +204,12 @@
 
     security.declarePublic('convert')
     def convert(self, name, orig, data=None, context=None, **kwargs):
-        """run a tranform of a given name on data
+        # run a tranform of a given name on data
+        
+        # * name is the name of a registered transform
 
-        * name is the name of a registered transform
+        # see convertTo docstring for more info
 
-        see convertTo docstring for more info
-        """
         if not data:
             data = self._wrap(name)
         try:
@@ -222,13 +222,13 @@
 
 
     def __call__(self, name, orig, data=None, context=None, **kwargs):
-        """run a transform by its name, returning the raw data product
+        # run a transform by its name, returning the raw data product
 
-        * name is the name of a registered transform.
+        # * name is the name of a registered transform.
+
+        # return an encoded string.
+        # see convert docstring for more info on additional arguments.
 
-        return an encoded string.
-        see convert docstring for more info on additional arguments.
-        """
         data = self.convert(name, orig, data, context, **kwargs)
         return data.getData()
 
@@ -560,6 +560,7 @@
 
     # mimetype oriented conversions (iengine interface) ########################
 
+    security.declarePrivate('registerTransform')
     def registerTransform(self, transform):
         """register a new transform
 

Modified: Products.PortalTransforms/branches/1.6/docs/HISTORY.txt
==============================================================================
--- Products.PortalTransforms/branches/1.6/docs/HISTORY.txt	(original)
+++ Products.PortalTransforms/branches/1.6/docs/HISTORY.txt	Wed Feb 16 07:03:44 2011
@@ -4,6 +4,8 @@
 1.6.13 - Unreleased
 -------------------
 
+* Fix missing security declarations.
+  [davisagli]
 
 1.6.12 - 2010-07-02
 -------------------

------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb