Commit 2e73c565 by Leonardo Rochael Almeida

On the way to Zope 2.12, Reform imports, specially from Globals (replacing it wi…

…th Products.ERP5Type.Globals on the products that depend on ERP5Type), convert Interface uses to zope.interfaces, and remove CMFMailIn references with blessings from Jerome.

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/portal_types@29459 20353a03-c40f-0410-a6d1-a30d3c3de9de
1 parent 55c4072f
Showing 313 changed files with 113 additions and 110 deletions
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass, DTMLFile
from Products.ERP5Type.Globals import InitializeClass, DTMLFile
from AccessControl import ClassSecurityInfo
from Products.CMFCore import CMFCorePermissions
from Products.ERP5Type.Base import Base
......
......@@ -29,7 +29,7 @@
from Products.ERP5Type.Base import Base
from Products.ERP5Type.Utils import getPath
from zLOG import LOG
from Globals import InitializeClass, DTMLFile
from Products.ERP5Type.Globals import InitializeClass, DTMLFile
from Products.PythonScripts.Utility import allow_class
class ActiveResult:
......
......@@ -44,7 +44,7 @@ from AccessControl.SecurityManagement import noSecurityManager
from AccessControl.SecurityManagement import setSecurityManager
from AccessControl.SecurityManagement import getSecurityManager
from Products.CMFCore.utils import UniqueObject, _getAuthenticatedUser, getToolByName
from Globals import InitializeClass, DTMLFile
from Products.ERP5Type.Globals import InitializeClass, DTMLFile
from Acquisition import aq_base
from Acquisition import aq_inner
from ActivityBuffer import ActivityBuffer
......
......@@ -28,7 +28,7 @@
import string
from Globals import InitializeClass, DTMLFile
from Products.ERP5Type.Globals import InitializeClass, DTMLFile
from AccessControl import ClassSecurityInfo
from AccessControl import getSecurityManager
from Acquisition import aq_base, aq_inner, aq_parent
......
......@@ -32,7 +32,7 @@ ERP portal_categories tool.
from OFS.Folder import Folder
from Products.CMFCore.utils import UniqueObject
from Globals import InitializeClass, DTMLFile
from Products.ERP5Type.Globals import InitializeClass, DTMLFile
from AccessControl import ClassSecurityInfo
from AccessControl import Unauthorized, getSecurityManager
from Acquisition import aq_base, aq_inner
......
......@@ -30,7 +30,7 @@
from UserList import UserList
import zope.interface
from Globals import InitializeClass
from Products.ERP5Type.Globals import InitializeClass
from Products.PythonScripts.Utility import allow_class
from AccessControl import ClassSecurityInfo
......
......@@ -27,7 +27,7 @@
#
##############################################################################
from Globals import InitializeClass
from Products.ERP5Type.Globals import InitializeClass
from Products.PythonScripts.Utility import allow_class
from AccessControl import ClassSecurityInfo
from Persistence import Persistent
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -26,7 +26,7 @@
#
##############################################################################
#from Globals import InitializeClass, PersistentMapping
#from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
#from Products.CMFCore.utils import getToolByName
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass
from Products.ERP5Type.Globals import InitializeClass
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
from Products.CMFCore.utils import getToolByName
......
......@@ -28,7 +28,7 @@
##############################################################################
import zope.interface
from Globals import InitializeClass
from Products.ERP5Type.Globals import InitializeClass
from AccessControl import ClassSecurityInfo
from Products.ERP5.Variated import Variated
from Products.ERP5.VariationValue import VariationValue
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass
from Products.ERP5Type.Globals import InitializeClass
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass
from Products.ERP5Type.Globals import InitializeClass
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass
from Products.ERP5Type.Globals import InitializeClass
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -28,7 +28,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -28,7 +28,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -29,7 +29,7 @@
import fnmatch, imp, os, re, shutil, sys
from Shared.DC.ZRDB.Connection import Connection as RDBConnection
from Globals import Persistent, PersistentMapping
from Products.ERP5Type.Globals import Persistent, PersistentMapping
from Acquisition import Implicit, aq_base
from AccessControl import ClassSecurityInfo
from Products.CMFCore.utils import getToolByName
......
......@@ -27,7 +27,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -28,7 +28,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -27,7 +27,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -27,7 +27,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -27,7 +27,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -27,7 +27,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Acquisition import aq_base
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -33,7 +33,7 @@ from zLOG import LOG
from AccessControl import ClassSecurityInfo, getSecurityManager
from AccessControl.SecurityManagement import newSecurityManager, setSecurityManager
from Acquisition import aq_base
from Globals import get_request
from Products.ERP5Type.Globals import get_request
from Products.CMFCore.utils import getToolByName, _checkPermission
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
from Products.ERP5Type.XMLObject import XMLObject
......
......@@ -29,7 +29,7 @@
import re, types
from DateTime import DateTime
from Globals import get_request
from Products.ERP5Type.Globals import get_request
from AccessControl import ClassSecurityInfo, Unauthorized
from Products.ERP5Type.Base import WorkflowMethod
from Products.CMFCore.utils import getToolByName, _checkPermission
......
......@@ -34,7 +34,7 @@ from Products.ExtFile.ExtFile import ExtFile
from Products.ExtFile.ExtImage import ExtImage
import os
from App.config import getConfiguration
from Globals import package_home
from Products.ERP5Type.Globals import package_home
from Products.ERP5 import product_path
from Shared.DC.ZRDB.TM import TM
import shutil
......
......@@ -27,7 +27,7 @@
##############################################################################
import zope.interface
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from DateTime import DateTime
......
......@@ -27,7 +27,7 @@
##############################################################################
import zope.interface
from Globals import InitializeClass
from Products.ERP5Type.Globals import InitializeClass
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Base, Permissions, PropertySheet, Constraint, interfaces
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass
from Products.ERP5Type.Globals import InitializeClass
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Base, Permissions, PropertySheet, Constraint, interfaces
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from DateTime import DateTime
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass
from Products.ERP5Type.Globals import InitializeClass
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Base, Permissions, PropertySheet, Constraint, interfaces
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass
from Products.ERP5Type.Globals import InitializeClass
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Base, Permissions, PropertySheet, Constraint, interfaces
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -27,7 +27,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from DateTime import DateTime
......
......@@ -27,7 +27,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -27,7 +27,7 @@
#
##############################################################################
from Globals import InitializeClass
from Products.ERP5Type.Globals import InitializeClass
from AccessControl import ClassSecurityInfo
from Products.CMFMailIn.MailMessage import MailMessage as CMFMailInMessage
......@@ -40,7 +40,7 @@ from zLOG import LOG
_MARKER = []
class MailMessage(Event, CMFMailInMessage):
class MailMessage(Event):
"""
LEGACY
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass
from Products.ERP5Type.Globals import InitializeClass
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -27,7 +27,7 @@
##############################################################################
import zope.interface
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
from Products.ERP5.Document.SupplyCell import SupplyCell
......
......@@ -27,7 +27,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Acquisition import aq_base
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass
from Products.ERP5Type.Globals import InitializeClass
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -31,7 +31,7 @@ from AccessControl import ClassSecurityInfo
from Products.CMFCore.utils import getToolByName
from Products.CMFCore.utils import _checkPermission
from Products.CMFCore.exceptions import AccessControl_Unauthorized
from Globals import PersistentMapping
from Products.ERP5Type.Globals import PersistentMapping
from Acquisition import aq_base
#from Products.ERP5.Core.Node import Node
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -28,7 +28,7 @@
import zope.interface
from warnings import warn
from Globals import InitializeClass
from Products.ERP5Type.Globals import InitializeClass
from AccessControl import ClassSecurityInfo
from Acquisition import aq_base, aq_inner
......@@ -41,7 +41,7 @@ from Products.ERP5Type.XMLObject import XMLObject
from Products.ERP5Type.Utils import convertToUpperCase
from Products.ERP5Type.Cache import getReadOnlyTransactionCache, enableReadOnlyTransactionCache, disableReadOnlyTransactionCache
from Products.ZSQLCatalog.SQLCatalog import SQLQuery
from Globals import PersistentMapping
from Products.ERP5Type.Globals import PersistentMapping
from zLOG import LOG
......
......@@ -28,7 +28,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -26,13 +26,13 @@
#
##############################################################################
from Globals import InitializeClass
from Products.ERP5Type.Globals import InitializeClass
from AccessControl import ClassSecurityInfo
from Products.CMFCore.utils import getToolByName
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
from Products.ERP5Type.TransactionalVariable import getTransactionalVariable
from Globals import PersistentMapping
from Products.ERP5Type.Globals import PersistentMapping
from Products.ERP5.Document.Movement import Movement
......
......@@ -27,7 +27,7 @@
##############################################################################
import zope.interface
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from Products.CMFCore.utils import getToolByName
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -26,7 +26,7 @@
#
##############################################################################
from Globals import InitializeClass, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -28,7 +28,7 @@
##############################################################################
import zope.interface
from Globals import InitializeClass
from Products.ERP5Type.Globals import InitializeClass
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, interfaces
......
......@@ -27,7 +27,7 @@
##############################################################################
import zope.interface
from Globals import InitializeClass
from Products.ERP5Type.Globals import InitializeClass
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
......
......@@ -28,8 +28,7 @@
from AccessControl import ClassSecurityInfo
from Products.CMFCore.utils import getToolByName
from Products.ERP5Type import Permissions, PropertySheet,\
Constraint, Interface, Cache
from Products.ERP5Type import Permissions, PropertySheet, Constraint, Cache
from Products.ERP5.Document.Domain import Domain
from Products.ERP5.Document.Document import PermanentURLMixIn
from Acquisition import ImplicitAcquisitionWrapper, aq_base, aq_inner
......
......@@ -32,7 +32,7 @@ from Products.ERP5.Document.WebSection import WebSection, WEBSECTION_KEY
from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces, Cache
from Products.ERP5Type.Cache import CachingMethod
from Globals import get_request
from Products.ERP5Type.Globals import get_request
from Persistence import Persistent
from ZPublisher import BeforeTraverse
from ZPublisher.HTTPRequest import HTTPRequest
......
......@@ -14,9 +14,9 @@
Portal class
"""
import Globals
from Products.ERP5Type import Globals
import AccessControl
from Globals import package_home
from Products.ERP5Type.Globals import package_home
from Products.SiteErrorLog.SiteErrorLog import manage_addErrorLog
from ZPublisher import BeforeTraverse
......
from Globals import get_request
from Products.ERP5Type.Globals import get_request
import time
from zLOG import LOG
......
from Globals import get_request
from Products.ERP5Type.Globals import get_request
from Acquisition import aq_base
from Globals import PersistentMapping
from Products.ERP5Type.Globals import PersistentMapping
from Products.CMFCore.utils import getToolByName
......
from Globals import get_request
from Products.ERP5Type.Globals import get_request
import re
import os
import sys
......
from Globals import get_request
from Products.ERP5Type.Globals import get_request
from Acquisition import aq_base
from Products.ERP5Type.Base import Base
from zLOG import LOG
......
......@@ -22,9 +22,9 @@ $Id$
"""
from OFS.SimpleItem import SimpleItem
from Globals import DTMLFile, PersistentMapping
from Products.ERP5Type.Globals import DTMLFile, PersistentMapping
from Acquisition import aq_inner, aq_parent
import Globals
from Products.ERP5Type import Globals
from AccessControl import ClassSecurityInfo
from Products.ERP5Type.Permissions import ManagePortal
......
......@@ -18,7 +18,7 @@
##############################################################################
import transaction
import Globals
from Products.ERP5Type import Globals
import App
from types import StringTypes
from AccessControl import getSecurityManager, ClassSecurityInfo
......
......@@ -27,7 +27,7 @@
#
##############################################################################
from AccessControl import ClassSecurityInfo
from Globals import InitializeClass, DTMLFile
from Products.ERP5Type.Globals import InitializeClass, DTMLFile
from Products.ERP5Type.Tool.BaseTool import BaseTool
from Products.ERP5Type import Permissions
from Products.ERP5 import _dtmldir
......
......@@ -31,7 +31,7 @@ import threading
from AccessControl import ClassSecurityInfo
from AccessControl.SecurityManagement import newSecurityManager
from Globals import InitializeClass, DTMLFile, PersistentMapping
from Products.ERP5Type.Globals import InitializeClass, DTMLFile, PersistentMapping
from Products.ERP5Type.Core.Folder import Folder
from Products.ERP5Type.Tool.BaseTool import BaseTool
from Products.ERP5Type import Permissions
......
......@@ -30,7 +30,7 @@
from Products.ERP5Type import Permissions
from AccessControl import ClassSecurityInfo
from Products.ERP5Type.Tool.BaseTool import BaseTool
from Globals import InitializeClass
from Products.ERP5Type.Globals import InitializeClass
class BuilderTool(BaseTool):
"""Base class for builder tools
......
......@@ -34,7 +34,7 @@ from Products.CMFCategory.CategoryTool import CategoryTool as CMFCategoryTool
from Products.ERP5Type.Tool.BaseTool import BaseTool
from AccessControl import ClassSecurityInfo
from Acquisition import aq_base
from Globals import InitializeClass
from Products.ERP5Type.Globals import InitializeClass
from Products.ERP5Type import Permissions
from Products.ERP5Type.CopySupport import CopyContainer
from Products.CMFCore.utils import getToolByName
......
......@@ -17,7 +17,8 @@
import urllib2, os, dircache, urllib
from StringIO import StringIO
from urllib2 import FileHandler, url2pathname, mimetypes, mimetools, addinfourl, URLError
from urllib2 import FileHandler, url2pathname, addinfourl, URLError
import mimetypes, mimetools
class DirectoryFileHandler(FileHandler):
"""
......
......@@ -27,7 +27,7 @@
#
##############################################################################
from AccessControl import ClassSecurityInfo
from Globals import InitializeClass
from Products.ERP5Type.Globals import InitializeClass
from Products.ERP5Type.Tool.BaseTool import BaseTool
......
......@@ -35,7 +35,7 @@ import urllib2, urllib
import inspect
from AccessControl import ClassSecurityInfo, getSecurityManager
from Globals import InitializeClass, DTMLFile
from Products.ERP5Type.Globals import InitializeClass, DTMLFile
from Products.CMFCore.utils import getToolByName, _checkPermission