Merge remote-tracking branch 'origin/master' into lazy_simulation_causality

bt5/erp5_dms_conversion_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_preConvertDocumentList.xml

@@ -66,7 +66,7 @@ if address not in MARKER and port not in MARKER:\n
     # we need a way to do this by introspection\n
     if ((getattr(document, "getData", None) is not None and document.getData() not in MARKER) or \\\n
         (getattr(document, "getBaseData", None) is not None and document.getBaseData() not in MARKER)):\n
-      document.activate(serialize_tag="conversion").Base_callPreConvert()\n
+      document.activate(tag="conversion").Base_callPreConvert()\n
 </string> </value>
         </item>
         <item>

bt5/erp5_dms_conversion_catalog/SkinTemplateItem/portal_skins/erp5_dms_conversion_catalog/WebPage_preConvert.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_body</string> </key>
+            <value> <string>"""\n
+  Do actual conversion of Web Page. As it involves cloudoo use serialization tag and activity.\n
+"""\n
+portal = context.getPortalObject()\n
+\n
+format_kw = {\'format\': format,\n
+            \'quality\': quality}\n
+for display in display_list:\n
+  format_kw[\'display\'] = display\n
+  context.activate(serialization_tag=\'pre_convert\').convert(**format_kw)\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string>format, quality, display_list</string> </value>
+        </item>
+        <item>
+            <key> <string>_proxy_roles</string> </key>
+            <value>
+              <tuple>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>WebPage_preConvert</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_dms_conversion_catalog/bt/revision

-14
\ No newline at end of file
+16
\ No newline at end of file