ZODB Components: Migrate Products.ERP5Type.Log from filesystem.

testUpgradeInstanceWithOldDataFs: Upgrade erp5_upgrader too (it was in keep
list until now) as old Data.fs contains ERP5UpgraderUtils Extension with import of
Products.ERP5Type.Log. Although, erp5_upgrader should probably be automatically
upgraded before even starting the upgrade...

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.py

 from Products.ERP5Type.Document import newTempBase
 from Products.ZSQLCatalog.SQLCatalog import SimpleQuery
 from Products.ERP5Type.Message import translateString
-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 portal = context.getPortalObject()
 request = portal.REQUEST
 params = portal.ERP5Site_getAccountingSelectionParameterDict(selection_name=selection_name)

bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Document_getStandardFileName.py

@@ -2,6 +2,6 @@
 # pylint: disable=redefined-builtin
 """Just an alias for real script
 """
-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 log('DeprecationWarning: Please use Document_getStandardFilename')
 return context.Document_getStandardFilename(format=format)

bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getAuthenticatedMemberPersonValue.py

 """Find and returns Person object for current logged in user.
 Returns None if no corresponding person, for example when not using ERP5Security.ERP5UserManager.
 """
-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 if user_name is None:
   log('DEPRECATED: call context.getPortalObject().portal_membership.getAuthenticatedMember().getUserValue()')
   return context.getPortalObject().portal_membership.getAuthenticatedMember().getUserValue()

bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/scripts/notifyOwner.py

@@ -5,7 +5,7 @@ and the getObject API of ERP5Catalog.
 This script has a proxy role to make sure we can find person documents in the
 catalog.
 """
-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 
 document = sci['object']
 portal = document.getPortalObject()

bt5/erp5_configurator/SkinTemplateItem/portal_skins/erp5_configurator_wizard/ERP5Site_afterConfigurationSetup.py

-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 
 after_script_id = context.getResourceValue().getConfigurationAfterScriptId()
 after_script = getattr(context, after_script_id, None)

bt5/erp5_configurator_maxma_demo/SkinTemplateItem/portal_skins/erp5_configurator_maxma_demo/BusinessConfiguration_afterMaxmaDemoConfiguration.py

 """ This script will be called to apply the customization. """
 from AccessControl import getSecurityManager
-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 
 portal = context.getPortalObject()
 bt = portal.portal_templates.getInstalledBusinessTemplate("erp5_demo_maxma_sample")

bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_standard/BusinessConfiguration_afterConfiguration.py

 """ This script will be called to apply the customization. """
-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 
 portal = context.getPortalObject()
 portal_preferences = portal.portal_preferences

bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_addEvent.py

-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 log('Obsoleted, please use Base_addEvent (with Base_viewAddEventDialog) instead')
 return context.Base_addEvent(title, direction, portal_type, resource, **kw)

bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_getTextContentCorrespondToFormat.py

 from Products.PythonScripts.standard import newline_to_br
-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 
 log("Event_getTextContentCorrespondToFormat is deprecated, use Event_getEditorFieldTextContent instead", level=100) # WARNING
 

bt5/erp5_data_notebook/ExtensionTemplateItem/portal_components/extension.erp5.JupyterCompile.py

@@ -16,7 +16,7 @@ import transaction
 import Acquisition
 import astor
 import importlib
-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 
 # Display matplotlib figure automatically like
 # the original python kernel

bt5/erp5_demo_smb/SkinTemplateItem/portal_skins/erp5_demo_smb/Alarm_setupDemoConfiguration.py

-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 log('Launching activities to setup the demo configuration!')
 
 kw = {}

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_getPreviewAsHTML.py

@@ -9,7 +9,7 @@ try:
   if not context.hasBaseData():
     error_message = context.Base_translateString("This document is not converted yet.")
 except Exception, e:
-  from Products.ERP5Type.Log import log
+  from erp5.component.module.Log import log
   log("asStrippedHTML", str(e))
   error_message = "%s %s" % (context.Base_translateString("Preview Error:"),
                               str(e))

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToConvertToBaseFormat.py

 from Products.ERP5.Document.Document import ConversionError
-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 from ZODB.POSException import ConflictError
 from xmlrpclib import Fault
 from socket import error as SocketError

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToUpdateBaseMetadata.py

 from ZODB.POSException import ConflictError
 from Products.ERP5.Document.Document import ConversionError
-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 
 message = None
 try:

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_uploadFile.py

@@ -10,7 +10,7 @@ It does the following:
 Otherwise it just uploads the file, bumps up revision number and calls metadata discovery script.
 
 """
-from Products.ERP5Type.Log import log, WARNING
+from erp5.component.module.Log import log, WARNING
 from Products.ERP5Type.Message import translateString
 
 translate = context.Base_translateString

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromAssignmentTree.py

@@ -9,7 +9,7 @@ Differences to the stock implementation:
   (unless we say it is strict)
 """
 
-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 
 category_list = []
 

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromDestination.py

@@ -2,7 +2,7 @@
 Security categories assigned from the Person who is set as the destination
 of the document (e.g. in Memo type).
 """
-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 category_list = []
 
 for ob in obj.getDestinationValueList():

bt5/erp5_email_reader/SkinTemplateItem/portal_skins/erp5_email_reader/EmailReader_generateTopicDomain.py

@@ -4,7 +4,7 @@
 """
 
 from Products.ERP5Type.Cache import CachingMethod
-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 #log("depth: %s parent: %s kw: %s" % (depth, repr(parent), repr(kw)))
 #log("selection: %s" % repr(context.portal_selections.getSelectionParamsFor('crawled_content_selection')))
 

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/ERP5Type_cloneRoleInformation.py

 """Obsolete compatibility script.
 """
-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 log("Obsolete script, please use BaseType_copyRoleList instead")
 
 print 'cloning role information from'

bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_callDialogMethod.py

@@ -12,7 +12,7 @@ There are runtime values hidden in every dialog form (injected by getHateoas Scr
   extra_param_json - JSON serialized extra parameters for the dialog script
 """
 
-from Products.ERP5Type.Log import log, WARNING
+from erp5.component.module.Log import log, WARNING
 from Products.Formulator.Errors import FormValidationError
 import json
 

bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_renderMessage.py

@@ -5,7 +5,7 @@ Return JSON with message to be displayed and set according HTTP STATUS for messa
 :param level: {str | int} use ERP5Type.Log levels or simply strings like "info", "warning", or "error"
 """
 import json
-from Products.ERP5Type.Log import WARNING, ERROR
+from erp5.component.module.Log import WARNING, ERROR
 
 if isinstance(level, (str, unicode)):
   if level.lower() == "error":

bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py

@@ -57,7 +57,7 @@ import time
 from email.utils import formatdate
 import re
 from zExceptions import Unauthorized
-from Products.ERP5Type.Log import log, WARNING, ERROR
+from erp5.component.module.Log import log, WARNING, ERROR
 from Products.ERP5Type.Message import Message
 from collections import OrderedDict
 from Products.ERP5Form.Selection import Selection

bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Workflow_statusModify.py

@@ -2,7 +2,7 @@ from Products.CMFCore.WorkflowCore import WorkflowException
 from Products.Formulator.Errors import FormValidationError
 from Products.DCWorkflow.DCWorkflow import ValidationFailed
 from Products.ERP5Type.Message import translateString
-from Products.ERP5Type.Log import WARNING
+from erp5.component.module.Log import WARNING
 
 portal = context.getPortalObject()
 request = REQUEST or context.REQUEST

bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/ContributionTool_getPropertyDictFromFileName.py

-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 log('DepracationWarning: Please use ContributionTool_getPropertyDictFromFilename')
 return context.ContributionTool_getPropertyDictFromFilename(file_name, property_dict)

bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getQuantityUnit.py

-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 log('Depracated usage of Item_getQuantityUnit, please use Item_getQuantityUnitItemList instead')
 return context.Item_getQuantityUnitItemList()

bt5/erp5_joblib/ExtensionTemplateItem/portal_components/extension.erp5.joblibUseCaseExamples.py

@@ -32,7 +32,7 @@ import numpy as np
 from copy import copy
 from math import sqrt
 
-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 from Products.CMFActivity.ActiveResult import ActiveResult
 from sklearn.base import clone
 from sklearn.utils import check_random_state

bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_common/Form_getFieldsRawProperties.py

-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 
 def getRealRelativeUrl(document):
   return '/'.join(context.getPortalObject().portal_url.getRelativeContentPath(document))

bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_web_officejs_ui/WebSection_getBase64ConfigurationUrlList.py

 import json
 import base64
-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 
 def getElementFromContent(key, content):
   before_template = '"%s" type="text/x-renderjs-configuration">'

bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_generateDomain.py

-#from Products.ERP5Type.Log import log
+#from erp5.component.module.Log import log
 request = context.REQUEST
 object_path = request.get('object_path')
 if object_path is None:

bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_getSourceTaskReportList.py

-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 log('task_list','starting')
 task_module = context.getDefaultModule('Task Report')
 log('task_list','next1')

bt5/erp5_scalability_test_auto_configuration/SkinTemplateItem/portal_skins/erp5_scalability_test_auto_configuration/Alarm_setupAutoConfiguration.py

@@ -2,7 +2,7 @@
 This script will setup the default ERP5's configuration as saved in erp5_scalability_test business template.
 As this modifies your site care must be taken!
 """
-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 
 portal = context.getPortalObject()
 configurator = getattr(portal.business_configuration_module, "default_standard_configuration", None)

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_getDestinationSectionItemList.py

-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 log('Deprecated: use Base_getPreferredSectionItemList instead.')
 
 section_cat = context.portal_preferences.getPreferredSectionCategory()

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_getSourceSectionItemList.py

-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 log('Deprecated: use Base_getPreferredSectionItemList instead.')
 
 section_cat = context.portal_preferences.getPreferredSectionCategory()

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_setCausalityFromSimulation.py

@@ -8,7 +8,7 @@ It will also not work if strict security is set on simulation. It's recommended
 (Delivery) Causality Movement Group as delivery level movement group in the corresponding
 delivery builder.
 """
-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 LOG = lambda msg:log(
           "Delivery_setCausalityFromSimulation on %s" % context.getPath(), msg)
 LOG = lambda msg:'DISABLED'

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_printAsODSSummary.py

@@ -4,7 +4,7 @@
 # We wants to get data in order to do a nice summary of items inside the order
 # This report will mainly usefull when the same resource is ordered on many
 # different lines
-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 if target_language:
   container.REQUEST['AcceptLanguage'].set(target_language, 10)
 

bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Folder_doNothing.py

-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 
 log("Folder method received dialog_id, form_id, uids and {!s}".format(kwargs.keys()))
 

bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBox_setPropertyList.py

 """
 Used to set properties for Listbox
 """
-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 
 field = context
 d = dict(

bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_uploadScreenshot.py

 """
   Upload a screenshot taken by the test to ERP5
 """
-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 
 data_uri = context.REQUEST.form.get('data_uri', 'default')
 

bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_registerUser.py

@@ -6,7 +6,7 @@
 
   XXX - redirect, translation of dialogs
 """
-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 req = context.REQUEST
 
 # check if everything was filled

product/ERP5/ERP5Site.py

@@ -33,7 +33,6 @@ from Products.ERP5Type.Accessor.Constant import PropertyGetter as ConstantGetter
 from Products.ERP5Type.Cache import caching_instance_method
 from Products.ERP5Type.Cache import CachingMethod, CacheCookieMixin
 from Products.ERP5Type.ERP5Type import ERP5TypeInformation
-from Products.ERP5Type.Log import log as unrestrictedLog
 from Products.CMFActivity.Errors import ActivityPendingError
 import ERP5Defaults
 from Products.ERP5Type.TransactionalVariable import getTransactionalVariable
@@ -1767,12 +1766,13 @@ class ERP5Site(ResponseHeaderGenerator, FolderMixIn, CMFSite, CacheCookieMixin):
   def log(self, *args, **kw):
     """Put a log message
 
-    See the warning in Products.ERP5Type.Log.log
+    See the warning in erp5.component.module.Log.log
     Catchall parameters also make this method not publishable to avoid DoS.
     """
     warnings.warn("The usage of ERP5Site.log is deprecated.\n"
-                  "Please use Products.ERP5Type.Log.log instead.",
+                  "Please use erp5.component.module.Log.log instead.",
                   DeprecationWarning)
+    from erp5.component.module.Log import log as unrestrictedLog
     unrestrictedLog(*args, **kw)
 
   security.declarePublic('setPlacelessDefaultReindexParameters')

product/ERP5Type/Log.py → product/ERP5/bootstrap/erp5_core/ModuleComponentTemplateItem/portal_components/module.erp5.Log.py

@@ -26,6 +26,7 @@
 #
 ##############################################################################
 
+# pylint: disable=unused-import
 from zLOG import (
   LOG,
   INFO,
@@ -41,7 +42,7 @@ from zLOG import (
 
 from traceback import extract_stack
 
-marker_ = []
+marker_ = object()
 def log(description, content=marker_, level=INFO):
   """Put a log message
 
@@ -71,3 +72,5 @@ def log(description, content=marker_, level=INFO):
   description = '%s: %s' % (head, description)
   LOG(description, level, content)
 
+from AccessControl.SecurityInfo import allow_module
+allow_module(__name__)
\ No newline at end of file

product/ERP5/bootstrap/erp5_core/ModuleComponentTemplateItem/portal_components/module.erp5.Log.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Module Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>Log</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5Type.Log</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>module.erp5.Log</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Module Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callDialogMethod.py

@@ -2,7 +2,7 @@
 Generic method called when submitting a form in dialog mode.
 Responsible for validating form data and redirecting to the form action.
 """
-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 
 # XXX We should not use meta_type properly,
 # XXX We need to discuss this problem.(yusei)

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getListbox.py

@@ -6,7 +6,7 @@ This script should be used to detect a listbox without having to name it "listbo
 
 Christophe Dumez <christophe@nexedi.com>
 """
-from Products.ERP5Type.Log import log, ERROR
+from erp5.component.module.Log import log, ERROR
 
 def isListBox(field):
   if field.meta_type == "ListBox":

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_printPdf.py

 """Compatibility script for old portal type Base_printPdf actions.
 """
-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 portal = context.getPortalObject()
 log('Deprecated Base_printPdf action called on a %s. '
     'Remove this action to use global print action.' % context.getPortalType())

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Category_getSortedCategoryChildValueList.py

-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 # this script is no longer needed.
 log('Category_getSortedCategoryChildValueList', 'use getCategoryChildValueList method')
 

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Type_getSecurityCategoryFromArrow.py

-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 log("ERP5Type_getSecurityCategoryFromArrow is deprecated, "
     "use ERP5Type_getSecurityCategoryFromContent instead")
 

product/ERP5/bootstrap/erp5_core/bt/template_module_component_id_list

@@ -2,5 +2,6 @@ module.erp5.DateUtils
 module.erp5.DiffUtils
 module.erp5.ExpandPolicy
 module.erp5.GeneratedAmountList
+module.erp5.Log
 module.erp5.MovementCollectionDiff
 module.erp5.MovementGroup
\ No newline at end of file

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_makeQuickSearchQuery.py

-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 from Products.ZSQLCatalog.SQLCatalog import Query
 
 # warn by logging (not possible use python's warn module in restricted environment)

product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ERP5Site_prepareAction.py

 # Script to call in action scripts before executig the actual action.
-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 log("ERP5Site_prepare is deprecated, "
     "use Base_updateListboxSelection instead")
 

product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Workflow_statusModify.py

@@ -2,7 +2,7 @@ from Products.CMFCore.WorkflowCore import WorkflowException
 from Products.Formulator.Errors import FormValidationError
 from Products.DCWorkflow.DCWorkflow import ValidationFailed
 from Products.ERP5Type.Message import translateString
-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 portal = context.getPortalObject()
 request = kw.get("REQUEST", None) or context.REQUEST
 

product/ERP5/tests/testInvalidationBug.py

@@ -185,7 +185,7 @@ class TestInvalidationBug(ERP5TypeTestCase):
       skin_folder.manage_delObjects(ids=['create_script'])
     skin = createZODBPythonScript(skin_folder, 'create_script', '**kw',
         """
-from Products.ERP5Type.Log import log
+from erp5.component.module.Log import log
 id_list = []
 for x in xrange(0, 1):
   organisation = context.newContent()

product/ERP5Type/Base.py

@@ -74,7 +74,6 @@ from Products.ERP5Type.mixin.property_translatable import PropertyTranslatableBu
 from Products.ERP5Type.XMLExportImport import Base_asXML
 from Products.ERP5Type.Cache import CachingMethod, clearCache, getReadOnlyTransactionCache
 from Accessor import WorkflowState
-from Products.ERP5Type.Log import log as unrestrictedLog
 from Products.ERP5Type.TransactionalVariable import getTransactionalVariable
 from Products.ERP5Type.Accessor.TypeDefinition import type_definition
 
@@ -3187,12 +3186,13 @@ class Base(
   def log(self, *args, **kw):
     """Put a log message
 
-    See the warning in Products.ERP5Type.Log.log
+    See the warning in erp5.component.module.Log.log
     Catchall parameters also make this method not publishable to avoid DoS.
     """
     warnings.warn("The usage of Base.log is deprecated.\n"
-                  "Please use Products.ERP5Type.Log.log instead.",
+                  "Please use erp5.component.module.Log.log instead.",
                   DeprecationWarning)
+    from erp5.component.module.Log import log as unrestrictedLog
     unrestrictedLog(*args, **kw)
 
   # Dublin Core Emulation for CMF interoperatibility

product/ERP5Type/__init__.py

@@ -179,7 +179,6 @@ ModuleSecurityInfo('Products.ERP5Type.Message').declarePublic('translateString')
 allow_module('Products.ERP5Type.Error')
 allow_module('Products.ERP5Type.Errors')
 allow_module('Products.ERP5Type.JSONEncoder')
-allow_module('Products.ERP5Type.Log')
 allow_module('Products.ERP5Type.ImmediateReindexContextManager')
 ModuleSecurityInfo('Products.ERP5Type.JSON').declarePublic('dumps', 'loads')
 ModuleSecurityInfo('Products.ERP5Type.Constraint').declarePublic('PropertyTypeValidity')

product/ERP5Type/tests/testUpgradeInstanceWithOldDataFs.py

@@ -56,8 +56,9 @@ class TestUpgradeInstanceWithOldDataFs(ERP5TypeTestCase):
          'erp5_configurator_standard_trade_template',
          'erp5_configurator_standard',
          'erp5_jquery',
-         'erp5_xhtml_style'),
-        ['erp5_upgrader'])""")
+         'erp5_xhtml_style',
+         'erp5_upgrader'),
+         ())""")
     self.tic()
 
     alarm = self.portal.portal_alarms.promise_check_upgrade

[Jérome Perrin]

This is a bit problematic here, because to run upgrader we need first to use this action

which will uses Base_callDialogMethod, so we need this to be functional to be able to update.

A patch like this make would make the old import name still available for restricted python.

diff --git a/product/ERP5Type/patches/Restricted.py b/product/ERP5Type/patches/Restricted.py
index ba06940c7a..10679175b0 100644
--- a/product/ERP5Type/patches/Restricted.py
+++ b/product/ERP5Type/patches/Restricted.py
@@ -343,6 +343,11 @@ def guarded_import(mname, globals=None, locals=None, fromlist=None,
   for fromname in fromlist or ():
     if fromname[:1] == '_':
       raise Unauthorized(fromname)
+
+  # BBB backward compatibility names for modules moved to ZODB components but
+  # used in restricted python
+  if mname == 'Products.ERP5Type.Log':
+    mname = 'erp5.component.module.Log'
   # ZODB Components must be imported beforehand as ModuleSecurityInfo() may be
   # called there and AccessControl secureModule() expects to find the module
   # in _moduleSecurity dict. Also, import loader will fill MNAME_MAP.

is this bad ?

[Jérome Perrin]

( also BTW, this log was useless !1184 (merged) )

[Arnaud Fontaine]

But before you upgrade erp5_core, erp5.component.module.Log does not exist yet, so this does not work? Generally speaking though, I don't understand why we have to update the repository before running the upgrader and also why we need to access ERP5 interface to launch it neither...

[Jérome Perrin]

But before you upgrade erp5_core, erp5.component.module.Log does not exist yet, so this does not work?

Ah yes, I just tried the patch after upgrading ... you are right it would be too early, so there's nothing we can do easily. Thanks anyway.

Generally speaking though, I don't understand why we have to update the repository before running the upgrader and also why we need to access ERP5 interface to launch it neither...

yes, that's probably the best direction. My understanding of the history is that when we started business template we did not trust it much, so we wanted to make a user interface where it's possible to check every change that is going to be applied before and decide for each change to apply it or not, but these days business template is reliable (and this user interface is still not really).

[Arnaud Fontaine]

I see three possibilities here:

• MR !1130.
• Allow to run Upgrader without requiring access to ERP5.
• Restore Products.ERP5Type.Log.

If possible, I would like to avoid restoring Products.ERP5Type.Log though...

[Jérome Perrin]

Yes.

Also, the workaround is super easy: edit Base_callDialogMethod to remove the import and the usage, like it was done (too late) in d2dedca3

so I guess we don't have to do anything in a hurry.

I was just suggesting this because it looked a 2 lines solution

[Arnaud Fontaine]

Thanks for pointing out this issue as it was an overlook from me...

[Jérome Perrin]

Have we considered allowing logging module in restricted python ?

this log module was horrible