py2/py3: more six.moves.UserDict

bt5/erp5_accounting/DocumentTemplateItem/portal_components/document.erp5.BalanceTransaction.py

@@ -26,7 +26,7 @@
 #
 ##############################################################################
 
-from UserDict import UserDict
+from six.moves import UserDict
 
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet

bt5/erp5_simplified_invoicing/TestTemplateItem/portal_components/test.erp5.testTradeModelLine.py

@@ -28,7 +28,7 @@
 #
 ##############################################################################
 
-from UserDict import UserDict
+from six.moves import UserDict
 import random
 import unittest
 from unittest import expectedFailure
@@ -61,6 +61,10 @@ class TestTradeModelLineMixin(TestBPMMixin, UserDict):
   order_date = DateTime()
   amount_generator_line_portal_type = 'Trade Model Line'
 
+  # XXX so that unittest.suite._isnotsuite return False
+  def __iter__(self):
+    raise TypeError()
+
   def setBaseAmountQuantityMethod(self, base_amount_id, text):
     """Populate TradeModelLine_getBaseAmountQuantityMethod shared script
 

product/CMFActivity/Activity/SQLJoblib.py

@@ -114,13 +114,13 @@ CREATE TABLE %s (
         active_process_uid = m.active_process_uid
         date = m.activity_kw.get('at_date')
         row = ','.join((
-          '@uid+%s' % i,
+          b'@uid+%s' % i,
           quote('/'.join(m.object_path)),
-          'NULL' if active_process_uid is None else str(active_process_uid),
-          "UTC_TIMESTAMP(6)" if date is None else quote(render_datetime(date)),
+          b'NULL' if active_process_uid is None else str(active_process_uid),
+          b"UTC_TIMESTAMP(6)" if date is None else quote(render_datetime(date)),
           quote(m.method_id),
-          '-1' if hasDependency(m) else '0',
-          str(m.activity_kw.get('priority', 1)),
+          b'-1' if hasDependency(m) else b'0',
+          bytes(m.activity_kw.get('priority', 1)),
           quote(m.getGroupId()),
           quote(m.activity_kw.get('tag', '')),
           quote(m.activity_kw.get('signature', '')),
@@ -156,7 +156,7 @@ CREATE TABLE %s (
         m = Message.load(line.message, uid=uid, line=line)
         try:
           # Select duplicates.
-          result = db.query("SELECT uid FROM message_job"
+          result = db.query(b"SELECT uid FROM message_job"
             " WHERE processing_node = 0 AND path = %s AND signature = %s"
             " AND method_id = %s AND group_method_id = %s FOR UPDATE" % (
               quote(path), quote(line.signature),