[Erp5-report] r24586 - in /erp5/trunk/products/CMFActivity/Activity: SQLDict.py SQLQueue.py

[nobody at svn.erp5.org]

Author: vincent
Date: Thu Nov 13 16:14:40 2008
New Revision: 24586

URL: http://svn.erp5.org?rev=24586&view=rev
Log:
Fix error log condition: length must be exactly 2 AND type must be either tuple or list (a string of more than 2 chars was enough to avoid the error message).
Fix a typo in error message.

Modified:
    erp5/trunk/products/CMFActivity/Activity/SQLDict.py
    erp5/trunk/products/CMFActivity/Activity/SQLQueue.py

Modified: erp5/trunk/products/CMFActivity/Activity/SQLDict.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/Activity/SQLDict.py?rev=24586&r1=24585&r2=24586&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/Activity/SQLDict.py [utf8] (original)
+++ erp5/trunk/products/CMFActivity/Activity/SQLDict.py [utf8] Thu Nov 13 16:14:40 2008
@@ -692,7 +692,7 @@
     return self._validate(activity_tool, message_uid=value)
 
   def _validate_after_path_and_method_id(self, activity_tool, message, value):
-    if not isinstance(value, (tuple, list)) or len(value) < 2:
+    if not (isinstance(value, (tuple, list)) or len(value) == 2):
       LOG('CMFActivity', WARNING,
           'unable to recognize value for after_path_and_method_id: %r' % (value,))
       return []

Modified: erp5/trunk/products/CMFActivity/Activity/SQLQueue.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/Activity/SQLQueue.py?rev=24586&r1=24585&r2=24586&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/Activity/SQLQueue.py [utf8] (original)
+++ erp5/trunk/products/CMFActivity/Activity/SQLQueue.py [utf8] Thu Nov 13 16:14:40 2008
@@ -546,9 +546,9 @@
     return self._validate(activity_tool, message_uid=value)
 
   def _validate_after_path_and_method_id(self, activity_tool, message, value):
-    if not isinstance(value, (tuple, list)) or len(value) < 2:
+    if not (isinstance(value, (tuple, list)) and len(value) == 2):
       LOG('CMFActivity', WARNING,
-          'unable to recognize value for after_path_and_method: %r' % (value,))
+          'unable to recognize value for after_path_and_method_id: %r' % (value,))
       return []
     return self._validate(activity_tool, path=value[0], method_id=value[1])