[CMF-checkins] CVS: CMF/CMFCore - ActionInformation.py:1.9.4.2 ContentTypeRegistry.py:1.9.4.2 CookieCrumbler.py:1.12.36.3

[Florent Guillaume]

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

Modified Files:
      Tag: CMF-1_3-branch
	ActionInformation.py ContentTypeRegistry.py CookieCrumbler.py 
Log Message:
Merged changes from HEAD:

Fixed typos in security declarations.



=== CMF/CMFCore/ActionInformation.py 1.9.4.1 => 1.9.4.2 ===
         """
         return getattr( self, 'condition', None ) and self.condition.text or ''
 
-    security.declarePublic( 'getPermission' )
+    security.declarePublic( 'getPermissions' )
     def getPermissions( self ):
 
         """ Return the permission, if any, required to execute the action.


=== CMF/CMFCore/ContentTypeRegistry.py 1.9.4.1 => 1.9.4.2 ===
         self.predicates[ predicate_id ] = ( klass( predicate_id ), None )
         self.predicate_ids = self.predicate_ids + ( predicate_id, )
 
-    security.declareProtected( ManagePortal, 'addPredicate' )
+    security.declareProtected( ManagePortal, 'updatePredicate' )
     def updatePredicate( self, predicate_id, predicate, typeObjectName ):
         """
             Update a predicate in this element.


=== CMF/CMFCore/CookieCrumbler.py 1.12.36.2 => 1.12.36.3 ===
     def getCookieMethod( self, name='setAuthCookie', default=None ):
         return getattr( self.aq_inner.aq_parent, name, default )
 
-    security.declarePrivate('setDefaultAuthCookie')
+    security.declarePrivate('defaultSetAuthCookie')
     def defaultSetAuthCookie( self, resp, cookie_name, cookie_value ):
         resp.setCookie( cookie_name, cookie_value, path='/')