[CMF-checkins] CVS: CMF/CMFCore - ActionProviderBase.py:1.13

[Tres Seaver]

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

Modified Files:
	ActionProviderBase.py 
Log Message:



  - Don't tuplify an existing tuple.


=== CMF/CMFCore/ActionProviderBase.py 1.12 => 1.13 ===
         a_expr = action and Expression(text=str(action)) or ''
         c_expr = condition and Expression(text=str(condition)) or ''
-        perm = permission and (str(permission),) or ()
+
+        if type( permission ) != type( () ):
+            permission = permission and (str(permission),) or ()
 
         new_actions = self._cloneActions()
 
@@ -113,7 +115,7 @@
                                       , title=str(name)
                                       , action=a_expr
                                       , condition=c_expr
-                                      , permissions=perm
+                                      , permissions=permission
                                       , category=str(category)
                                       , visible=int(visible)
                                       )