Commit 3be71dd3 authored by Yoshinori Okuji's avatar Yoshinori Okuji

Use pre-defined types. Check if an exception type is a class before issubclass.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@5661 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 9d80350c
...@@ -35,6 +35,7 @@ from Products.CMFActivity.ActiveObject import DISTRIBUTABLE_STATE, INVOKE_ERROR_ ...@@ -35,6 +35,7 @@ from Products.CMFActivity.ActiveObject import DISTRIBUTABLE_STATE, INVOKE_ERROR_
from ZODB.POSException import ConflictError from ZODB.POSException import ConflictError
import sys import sys
import sha import sha
from types import ClassType, StringType, ListType, TupleType
try: try:
from transaction import get as get_transaction from transaction import get as get_transaction
...@@ -325,7 +326,7 @@ class SQLDict(RAMDict): ...@@ -325,7 +326,7 @@ class SQLDict(RAMDict):
# No more activity # No more activity
m.notifyUser(activity_tool, message="Process Finished") # XXX commit bas ??? m.notifyUser(activity_tool, message="Process Finished") # XXX commit bas ???
else: else:
if issubclass(m.exc_type, ConflictError): if type(m.exc_type) is ClassType and issubclass(m.exc_type, ConflictError):
# If this is a conflict error, do not lower the priority but only delay. # If this is a conflict error, do not lower the priority but only delay.
activity_tool.SQLDict_setPriority(uid = uid_list, delay = VALIDATION_ERROR_DELAY, activity_tool.SQLDict_setPriority(uid = uid_list, delay = VALIDATION_ERROR_DELAY,
retry = 1) retry = 1)
...@@ -487,7 +488,7 @@ class SQLDict(RAMDict): ...@@ -487,7 +488,7 @@ class SQLDict(RAMDict):
# Validation private methods # Validation private methods
def _validate_after_method_id(self, activity_tool, message, value): def _validate_after_method_id(self, activity_tool, message, value):
# Count number of occurances of method_id # Count number of occurances of method_id
if type(value) == type(''): if type(value) is StringType:
value = [value] value = [value]
if len(value)>0: # if empty list provided, the message is valid if len(value)>0: # if empty list provided, the message is valid
result = activity_tool.SQLDict_validateMessageList(method_id=value, message_uid=None, path=None) result = activity_tool.SQLDict_validateMessageList(method_id=value, message_uid=None, path=None)
...@@ -497,7 +498,7 @@ class SQLDict(RAMDict): ...@@ -497,7 +498,7 @@ class SQLDict(RAMDict):
def _validate_after_path(self, activity_tool, message, value): def _validate_after_path(self, activity_tool, message, value):
# Count number of occurances of path # Count number of occurances of path
if type(value) == type(''): if type(value) is StringType:
value = [value] value = [value]
if len(value)>0: # if empty list provided, the message is valid if len(value)>0: # if empty list provided, the message is valid
result = activity_tool.SQLDict_validateMessageList(method_id=None, message_uid=None, path=value) result = activity_tool.SQLDict_validateMessageList(method_id=None, message_uid=None, path=value)
...@@ -514,14 +515,14 @@ class SQLDict(RAMDict): ...@@ -514,14 +515,14 @@ class SQLDict(RAMDict):
def _validate_after_path_and_method_id(self, activity_tool, message, value): def _validate_after_path_and_method_id(self, activity_tool, message, value):
# Count number of occurances of path and method_id # Count number of occurances of path and method_id
if (type(value) != type ( (0,) ) and type(value) != type([])) or len(value)<2: if (type(value) != TupleType and type(value) != ListType) or len(value)<2:
LOG('CMFActivity WARNING :', 0, 'unable to recognize value for after_path_and_method_id : %s' % repr(value)) LOG('CMFActivity WARNING :', 0, 'unable to recognize value for after_path_and_method_id : %s' % repr(value))
return VALID return VALID
path = value[0] path = value[0]
method = value[1] method = value[1]
if type(path) == type(''): if type(path) is StringType:
path = [path] path = [path]
if type(method) == type(''): if type(method) is StringType:
method = [method] method = [method]
result = activity_tool.SQLDict_validateMessageList(method_id=method, message_uid=None, path=path) result = activity_tool.SQLDict_validateMessageList(method_id=method, message_uid=None, path=path)
if result[0].uid_count > 0: if result[0].uid_count > 0:
...@@ -530,7 +531,7 @@ class SQLDict(RAMDict): ...@@ -530,7 +531,7 @@ class SQLDict(RAMDict):
def _validate_after_tag(self, activity_tool, message, value): def _validate_after_tag(self, activity_tool, message, value):
# Count number of occurances of tag # Count number of occurances of tag
if type(value) == type(''): if type(value) is StringType:
value = [value] value = [value]
result = activity_tool.SQLDict_validateMessageList(method_id=None, message_uid=None, tag=value) result = activity_tool.SQLDict_validateMessageList(method_id=None, message_uid=None, tag=value)
if result[0].uid_count > 0: if result[0].uid_count > 0:
...@@ -539,14 +540,14 @@ class SQLDict(RAMDict): ...@@ -539,14 +540,14 @@ class SQLDict(RAMDict):
def _validate_after_tag_and_method_id(self, activity_tool, message, value): def _validate_after_tag_and_method_id(self, activity_tool, message, value):
# Count number of occurances of tag and method_id # Count number of occurances of tag and method_id
if (type(value) != type ( (0,) ) and type(value) != type([])) or len(value)<2: if (type(value) != TupleType and type(value) != ListType) or len(value)<2:
LOG('CMFActivity WARNING :', 0, 'unable to recognize value for after_tag_and_method_id : %s' % repr(value)) LOG('CMFActivity WARNING :', 0, 'unable to recognize value for after_tag_and_method_id : %s' % repr(value))
return VALID return VALID
tag = value[0] tag = value[0]
method = value[1] method = value[1]
if type(tag) == type(''): if type(tag) is StringType:
tag = [tag] tag = [tag]
if type(method) == type(''): if type(method) is StringType:
method = [method] method = [method]
result = activity_tool.SQLDict_validateMessageList(method_id=method, message_uid=None, tag=tag) result = activity_tool.SQLDict_validateMessageList(method_id=method, message_uid=None, tag=tag)
if result[0].uid_count > 0: if result[0].uid_count > 0:
......
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