Commit 81d87ef6 authored by Sebastien Robin's avatar Sebastien Robin

move ActivityFlushError to CMFAcitivity/Errors.py, also added ActivityPendingError

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@12487 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent c9457137
...@@ -32,6 +32,7 @@ from Products.CMFActivity.ActivityTool import registerActivity ...@@ -32,6 +32,7 @@ from Products.CMFActivity.ActivityTool import registerActivity
from Queue import VALID, INVALID_ORDER, INVALID_PATH, EXCEPTION, MAX_PROCESSING_TIME, VALIDATION_ERROR_DELAY from Queue import VALID, INVALID_ORDER, INVALID_PATH, EXCEPTION, MAX_PROCESSING_TIME, VALIDATION_ERROR_DELAY
from RAMDict import RAMDict from RAMDict import RAMDict
from Products.CMFActivity.ActiveObject import DISTRIBUTABLE_STATE, INVOKE_ERROR_STATE, VALIDATE_ERROR_STATE from Products.CMFActivity.ActiveObject import DISTRIBUTABLE_STATE, INVOKE_ERROR_STATE, VALIDATE_ERROR_STATE
from Products.CMFActivity.Errors import ActivityFlushError
from ZODB.POSException import ConflictError from ZODB.POSException import ConflictError
import sys import sys
import sha import sha
...@@ -54,8 +55,6 @@ priority_weight = \ ...@@ -54,8 +55,6 @@ priority_weight = \
[4] * 5 + \ [4] * 5 + \
[5] * 1 [5] * 1
class ActivityFlushError(Exception):
"""Error during active message flush"""
class SQLDict(RAMDict): class SQLDict(RAMDict):
""" """
......
...@@ -32,6 +32,7 @@ from RAMQueue import RAMQueue ...@@ -32,6 +32,7 @@ from RAMQueue import RAMQueue
from DateTime import DateTime from DateTime import DateTime
from Queue import VALID, INVALID_ORDER, INVALID_PATH, EXCEPTION, MAX_PROCESSING_TIME, VALIDATION_ERROR_DELAY from Queue import VALID, INVALID_ORDER, INVALID_PATH, EXCEPTION, MAX_PROCESSING_TIME, VALIDATION_ERROR_DELAY
from Products.CMFActivity.ActiveObject import DISTRIBUTABLE_STATE, INVOKE_ERROR_STATE, VALIDATE_ERROR_STATE from Products.CMFActivity.ActiveObject import DISTRIBUTABLE_STATE, INVOKE_ERROR_STATE, VALIDATE_ERROR_STATE
from Products.CMFActivity.Errors import ActivityFlushError
from ZODB.POSException import ConflictError from ZODB.POSException import ConflictError
from types import StringType, ClassType from types import StringType, ClassType
import sys import sys
...@@ -52,9 +53,6 @@ priority_weight = \ ...@@ -52,9 +53,6 @@ priority_weight = \
[4] * 5 + \ [4] * 5 + \
[5] * 1 [5] * 1
class ActivityFlushError(Exception):
"""Error during active message flush"""
class SQLQueue(RAMQueue): class SQLQueue(RAMQueue):
""" """
A simple OOBTree based queue. It should be compatible with transactions A simple OOBTree based queue. It should be compatible with transactions
......
...@@ -53,3 +53,6 @@ def initialize( context ): ...@@ -53,3 +53,6 @@ def initialize( context ):
# This is used by a script (external method) that can be run # This is used by a script (external method) that can be run
# to set up CMFActivity in an existing CMF Site instance. # to set up CMFActivity in an existing CMF Site instance.
cmfactivity_globals = globals() cmfactivity_globals = globals()
from AccessControl.SecurityInfo import allow_module
allow_module('Products.CMFActivity.Errors')
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment