[Erp5-report] r19084 - /erp5/trunk/products/CMFActivity/ActivityTool.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Feb 5 20:47:17 CET 2008
Author: vincent
Date: Tue Feb 5 20:47:17 2008
New Revision: 19084
URL: http://svn.erp5.org?rev=19084&view=rev
Log:
Oops, stupid syntax error: a single "try" block cannot have both "except" and "finally" section. Split.
Modified:
erp5/trunk/products/CMFActivity/ActivityTool.py
Modified: erp5/trunk/products/CMFActivity/ActivityTool.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/ActivityTool.py?rev=19084&r1=19083&r2=19084&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/ActivityTool.py (original)
+++ erp5/trunk/products/CMFActivity/ActivityTool.py Tue Feb 5 20:47:17 2008
@@ -567,35 +567,36 @@
old_sm = getSecurityManager()
try:
- # get owner of portal_catalog, so normally we should be able to
- # have the permission to invoke all activities
- user = self.portal_catalog.getWrappedOwner()
- newSecurityManager(self.REQUEST, user)
-
- currentNode = self.getCurrentNode()
- self.registerNode(currentNode)
- processing_node_list = self.getNodeList(role=ROLE_PROCESSING)
-
- # only distribute when we are the distributingNode or if it's empty
- if (self.getDistributingNode() == currentNode):
- self.distribute(len(processing_node_list))
-
- # SkinsTool uses a REQUEST cache to store skin objects, as
- # with TimerService we have the same REQUEST over multiple
- # portals, we clear this cache to make sure the cache doesn't
- # contains skins from another portal.
- stool = getToolByName(self, 'portal_skins', None)
- if stool is not None:
- stool.changeSkin(None)
-
- # call tic for the current processing_node
- # the processing_node numbers are the indices of the elements in the node tuple +1
- # because processing_node starts form 1
- if currentNode in processing_node_list:
- self.tic(processing_node_list.index(currentNode)+1)
- except:
- # Catch ALL exception to avoid killing timerserver.
- LOG('ActivityTool', ERROR, 'process_timer received an exception', error=sys.exc_info())
+ try:
+ # get owner of portal_catalog, so normally we should be able to
+ # have the permission to invoke all activities
+ user = self.portal_catalog.getWrappedOwner()
+ newSecurityManager(self.REQUEST, user)
+
+ currentNode = self.getCurrentNode()
+ self.registerNode(currentNode)
+ processing_node_list = self.getNodeList(role=ROLE_PROCESSING)
+
+ # only distribute when we are the distributingNode or if it's empty
+ if (self.getDistributingNode() == currentNode):
+ self.distribute(len(processing_node_list))
+
+ # SkinsTool uses a REQUEST cache to store skin objects, as
+ # with TimerService we have the same REQUEST over multiple
+ # portals, we clear this cache to make sure the cache doesn't
+ # contains skins from another portal.
+ stool = getToolByName(self, 'portal_skins', None)
+ if stool is not None:
+ stool.changeSkin(None)
+
+ # call tic for the current processing_node
+ # the processing_node numbers are the indices of the elements in the node tuple +1
+ # because processing_node starts form 1
+ if currentNode in processing_node_list:
+ self.tic(processing_node_list.index(currentNode)+1)
+ except:
+ # Catch ALL exception to avoid killing timerserver.
+ LOG('ActivityTool', ERROR, 'process_timer received an exception', error=sys.exc_info())
finally:
timerservice_lock.release()
setSecurityManager(old_sm)
More information about the Erp5-report
mailing list