Commit d54de962 authored by wenjie.zheng's avatar wenjie.zheng Committed by Sebastien Robin

Utils.py: revert reorganised imports.

parent 8330baff
...@@ -28,26 +28,33 @@ ...@@ -28,26 +28,33 @@
############################################################################## ##############################################################################
# Required modules - some modules are imported later to prevent circular deadlocks # Required modules - some modules are imported later to prevent circular deadlocks
import inspect
import os import os
import persistent
import re import re
import string import string
import sys
import time import time
import warnings import warnings
import sys
from AccessControl import ModuleSecurityInfo, getSecurityManager import inspect
import persistent
from hashlib import md5 as md5_new, sha1 as sha_new
from Products.ERP5Type.Globals import package_home
from Products.ERP5Type.Globals import DevelopmentMode
from Acquisition import aq_base
from Acquisition import aq_inner
from Acquisition import aq_parent
from Acquisition import aq_self
from AccessControl import ModuleSecurityInfo
from AccessControl.SecurityInfo import allow_class from AccessControl.SecurityInfo import allow_class
from AccessControl import getSecurityManager
from AccessControl.SecurityManagement import newSecurityManager from AccessControl.SecurityManagement import newSecurityManager
from Acquisition import aq_base, aq_inner, aq_parent, aq_self
from hashlib import md5 as md5_new, sha1 as sha_new
from Products.CMFCore import utils from Products.CMFCore import utils
from Products.CMFCore.DirectoryView import registerDirectory
from Products.CMFCore.Expression import Expression from Products.CMFCore.Expression import Expression
from Products.CMFCore.DirectoryView import registerDirectory
from Products.CMFCore.utils import getToolByName from Products.CMFCore.utils import getToolByName
from Products.ERP5Type.Globals import package_home, DevelopmentMode from Products.PageTemplates.Expressions import getEngine
from Products.PageTemplates.Expressions import getEngine, SecureModuleImporter from Products.PageTemplates.Expressions import SecureModuleImporter
from Products.ZCatalog.Lazy import LazyMap from Products.ZCatalog.Lazy import LazyMap
try: try:
...@@ -423,7 +430,6 @@ def checkPythonSourceCode(source_code_str): ...@@ -423,7 +430,6 @@ def checkPythonSourceCode(source_code_str):
allow passing a string) and this should probably return a proper allow passing a string) and this should probably return a proper
ERP5 object rather than a dict... ERP5 object rather than a dict...
""" """
if not source_code_str: if not source_code_str:
return [] return []
......
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