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

On the way to Zope 2.12, Reform imports, specially from Globals (replacing it with 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

product/CMFActivity/ActiveProcess.py

@@ -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

product/CMFActivity/ActiveResult.py

@@ -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:

product/CMFActivity/ActivityTool.py

@@ -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

product/CMFCategory/Category.py

@@ -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

product/CMFCategory/CategoryTool.py

@@ -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

product/ERP5/AggregatedAmountList.py

@@ -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
 

product/ERP5/DivergenceSolutionDecision.py

@@ -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

product/ERP5/Document/Account.py

@@ -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

product/ERP5/Document/AccountingRuleCell.py

@@ -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

product/ERP5/Document/AccountingTransaction.py

@@ -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

product/ERP5/Document/Amount.py

@@ -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

product/ERP5/Document/AnnotationLine.py

@@ -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

product/ERP5/Document/Assignment.py

@@ -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
 

product/ERP5/Document/AssortedResource.py

@@ -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

product/ERP5/Document/BaseDomain.py

@@ -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

product/ERP5/Document/Binder.py

@@ -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
 

product/ERP5/Document/BusinessProcess.py

@@ -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

product/ERP5/Document/BusinessState.py

@@ -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

product/ERP5/Document/BusinessTemplate.py

@@ -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

product/ERP5/Document/Career.py

@@ -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
 

product/ERP5/Document/Consumption.py

@@ -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

product/ERP5/Document/Container.py

@@ -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

product/ERP5/Document/ContainerCell.py

@@ -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

product/ERP5/Document/ContainerLine.py

@@ -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

product/ERP5/Document/DeliveryCell.py

@@ -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
 

product/ERP5/Document/DependentCapacity.py

@@ -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

product/ERP5/Document/Device.py

@@ -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

product/ERP5/Document/Discount.py

@@ -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

product/ERP5/Document/Document.py

@@ -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

product/ERP5/Document/EmailDocument.py

@@ -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

product/ERP5/Document/ExtFolder.py

@@ -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

product/ERP5/Document/ImmobilisableItem.py

@@ -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

product/ERP5/Document/Immobilisation.py

@@ -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

product/ERP5/Document/ImmobilisationCell.py

@@ -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

product/ERP5/Document/ImmobilisationDelivery.py

@@ -26,7 +26,7 @@
 #
 ##############################################################################
 
-from Globals import InitializeClass, PersistentMapping
+from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo
 
 from DateTime import DateTime

product/ERP5/Document/ImmobilisationLine.py

@@ -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

product/ERP5/Document/ImmobilisationMovement.py

@@ -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

product/ERP5/Document/IndependentCapacity.py

@@ -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

product/ERP5/Document/InvoiceCell.py

@@ -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

product/ERP5/Document/InvoiceLine.py

@@ -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

product/ERP5/Document/Item.py

@@ -27,7 +27,7 @@
 #
 ##############################################################################
 
-from Globals import InitializeClass, PersistentMapping
+from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo
 
 from DateTime import DateTime

product/ERP5/Document/LeavePeriod.py

@@ -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

product/ERP5/Document/MailMessage.py

@@ -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
 

product/ERP5/Document/MappedValue.py

@@ -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

product/ERP5/Document/OpenOrder.py

@@ -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

product/ERP5/Document/OpenOrderCell.py

@@ -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

product/ERP5/Document/OrderCell.py

@@ -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
 

product/ERP5/Document/OrderLine.py

@@ -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

product/ERP5/Document/Path.py

@@ -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

product/ERP5/Document/PaymentCondition.py

@@ -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

product/ERP5/Document/Person.py

@@ -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

product/ERP5/Document/PortalTest.py

@@ -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

product/ERP5/Document/Predicate.py

@@ -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
 

product/ERP5/Document/PresencePeriod.py

@@ -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

product/ERP5/Document/Pricing.py

@@ -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

product/ERP5/Document/ProductionReport.py

@@ -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
 

product/ERP5/Document/ProductionReportCell.py

@@ -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

product/ERP5/Document/ProductionReportLine.py

@@ -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

product/ERP5/Document/SetPricing.py

@@ -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

product/ERP5/Document/SimulationMovement.py

@@ -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
 

product/ERP5/Document/SubscriptionItem.py

@@ -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

product/ERP5/Document/SupplyCell.py

@@ -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

product/ERP5/Document/SupplyChain.py

@@ -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

product/ERP5/Document/SupplyLink.py

@@ -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

product/ERP5/Document/SupplyRule.py

@@ -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

product/ERP5/Document/TransformedResource.py

@@ -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

product/ERP5/Document/VariatedProperty.py

@@ -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

product/ERP5/Document/WebSection.py

@@ -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

product/ERP5/Document/WebSite.py

@@ -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

product/ERP5/ERP5Site.py

@@ -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

product/ERP5/Extensions/CachePageTemplate.py

-from Globals import get_request
+from Products.ERP5Type.Globals import get_request
 import time
 from zLOG import LOG
 

product/ERP5/Extensions/CheckPortalTypes.py

-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
 
 

product/ERP5/Extensions/CheckSkins.py

-from Globals import get_request
+from Products.ERP5Type.Globals import get_request
 import re
 import os
 import sys

product/ERP5/Extensions/RecodeAllDocuments.py

-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

product/ERP5/Interaction.py

@@ -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

product/ERP5/InteractionWorkflow.py

@@ -18,7 +18,7 @@
 ##############################################################################
 
 import transaction
-import Globals
+from Products.ERP5Type import Globals
 import App
 from types import StringTypes
 from AccessControl import getSecurityManager, ClassSecurityInfo

product/ERP5/Tool/AcknowledgementTool.py

@@ -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

product/ERP5/Tool/AlarmTool.py

@@ -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

product/ERP5/Tool/BuilderTool.py

@@ -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

product/ERP5/Tool/CategoryTool.py

@@ -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

product/ERP5/Tool/ContributionOpener.py

@@ -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):
     """

product/ERP5/Tool/ContributionRegistryTool.py

@@ -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
 
 

product/ERP5/Tool/ContributionTool.py

@@ -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
 from Products.ERP5Type.Tool.BaseTool import BaseTool
 from Products.ERP5Type import Permissions

product/ERP5/Tool/DeliveryTool.py

@@ -29,7 +29,7 @@
 ##############################################################################
 
 from AccessControl import ClassSecurityInfo
-from Globals import InitializeClass, DTMLFile
+from Products.ERP5Type.Globals import InitializeClass, DTMLFile
 from Products.ERP5.Tool.BuilderTool import BuilderTool
 from Products.ERP5Type import Permissions
 

product/ERP5/Tool/DomainTool.py

@@ -28,7 +28,7 @@
 ##############################################################################
 
 from AccessControl import ClassSecurityInfo
-from Globals import InitializeClass, DTMLFile
+from Products.ERP5Type.Globals import InitializeClass, DTMLFile
 from Products.ERP5Type import Permissions
 from Products.ERP5 import _dtmldir
 from Products.ERP5Type.Tool.BaseTool import BaseTool

product/ERP5/Tool/IdTool.py

@@ -28,7 +28,7 @@
 
 from Acquisition import aq_base
 from AccessControl import ClassSecurityInfo
-from Globals import InitializeClass, DTMLFile, PersistentMapping
+from Products.ERP5Type.Globals import InitializeClass, DTMLFile, PersistentMapping
 from Products.ERP5Type.Tool.BaseTool import BaseTool
 from Products.ERP5Type import Permissions
 from Products.CMFCore.utils import getToolByName

product/ERP5/Tool/InterpolationTool.py

@@ -28,7 +28,7 @@
 
 from AccessControl import ClassSecurityInfo
 from Products.CMFCore.utils import UniqueObject, _checkPermission, _getAuthenticatedUser
-from Globals import InitializeClass
+from Products.ERP5Type.Globals import InitializeClass
 from Acquisition import aq_base
 from DateTime import DateTime
 

product/ERP5/Tool/IntrospectionTool.py

@@ -30,7 +30,7 @@
 import os
 import tempfile
 from AccessControl import ClassSecurityInfo
-from Globals import InitializeClass, DTMLFile
+from Products.ERP5Type.Globals import InitializeClass, DTMLFile
 from Products.CMFCore.utils import getToolByName
 from Products.ERP5Type.Tool.BaseTool import BaseTool
 from Products.ERP5Type import Permissions

product/ERP5/Tool/NotificationTool.py

@@ -26,7 +26,7 @@
 #
 ##############################################################################
 from AccessControl import ClassSecurityInfo
-from Globals import DTMLFile
+from Products.ERP5Type.Globals import DTMLFile
 from Products.CMFCore.utils import getToolByName
 from Products.ERP5Type.Tool.BaseTool import BaseTool
 from Products.ERP5Type import Permissions

product/ERP5/Tool/OrderTool.py

@@ -29,7 +29,7 @@
 ##############################################################################
 
 from AccessControl import ClassSecurityInfo
-from Globals import InitializeClass, DTMLFile
+from Products.ERP5Type.Globals import InitializeClass, DTMLFile
 from Products.ERP5.Tool.BuilderTool import BuilderTool
 from Products.ERP5Type import Permissions
 

product/ERP5/Tool/PasswordTool.py

@@ -29,7 +29,7 @@
 import socket
 
 from AccessControl import ClassSecurityInfo
-from Globals import InitializeClass, DTMLFile, get_request
+from Products.ERP5Type.Globals import InitializeClass, DTMLFile, get_request
 from Products.ERP5Type.Tool.BaseTool import BaseTool
 from Products.ERP5Type import Permissions
 from Products.ERP5 import _dtmldir
@@ -38,7 +38,7 @@ import time, random, md5
 from DateTime import DateTime
 from Products.ERP5Type.Message import translateString
 from Acquisition import aq_base
-from Globals import PersistentMapping
+from Products.ERP5Type.Globals import PersistentMapping
 
 class PasswordTool(BaseTool):
   """

product/ERP5/Tool/RuleTool.py

@@ -29,7 +29,7 @@
 from Products.CMFCore.utils import UniqueObject
 
 from AccessControl import ClassSecurityInfo
-from Globals import InitializeClass, DTMLFile
+from Products.ERP5Type.Globals import InitializeClass, DTMLFile
 from Products.ERP5Type.Core.Folder import Folder
 from Products.ERP5Type import Permissions
 from Products.CMFCore.utils import getToolByName

product/ERP5/Tool/SimulationTool.py

@@ -30,7 +30,7 @@
 from Products.CMFCore.utils import getToolByName
 
 from AccessControl import ClassSecurityInfo
-from Globals import InitializeClass, DTMLFile
+from Products.ERP5Type.Globals import InitializeClass, DTMLFile
 from Products.ERP5Type import Permissions
 from Products.ERP5Type.Tool.BaseTool import BaseTool
 

product/ERP5/Tool/TemplateTool.py

@@ -34,7 +34,7 @@ import shutil
 
 from Acquisition import Implicit
 from AccessControl import ClassSecurityInfo
-from Globals import InitializeClass, DTMLFile, PersistentMapping
+from Products.ERP5Type.Globals import InitializeClass, DTMLFile, PersistentMapping
 from Products.ERP5Type.Tool.BaseTool import BaseTool
 from Products.ERP5Type import Permissions, tarfile
 from Products.ERP5.Document.BusinessTemplate import BusinessTemplateMissingDependency

product/ERP5/Tool/TestTool.py

@@ -32,7 +32,7 @@ from Products.CMFCore.utils import UniqueObject
 
 from Acquisition import Implicit
 from AccessControl import ClassSecurityInfo
-from Globals import InitializeClass, DTMLFile, PersistentMapping
+from Products.ERP5Type.Globals import InitializeClass, DTMLFile, PersistentMapping
 from Products.ERP5Type.Tool.BaseTool import BaseTool
 from Products.ERP5Type import Permissions
 

product/ERP5/Tool/TrashTool.py

@@ -28,7 +28,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

product/ERP5/Variated.py

@@ -27,7 +27,7 @@
 ##############################################################################
 
 from AccessControl import ClassSecurityInfo
-from Globals import InitializeClass
+from Products.ERP5Type.Globals import InitializeClass
 from Products.CMFCore.utils import getToolByName
 
 from Products.ERP5Type import Context, interfaces, Permissions
@@ -35,6 +35,7 @@ from Products.ERP5Type.Base import Base
 from Products.CMFCategory.Renderer import Renderer
 
 from warnings import warn
+from zope.interface import implements
 
 class Variated(Base):
   """
@@ -57,7 +58,7 @@ class Variated(Base):
   security = ClassSecurityInfo()
 
   # Declarative interfaces
-  __implements__ = (interfaces.IVariated, )
+  implements(interfaces.IVariated)
 
   security.declareProtected(Permissions.AccessContentsInformation, 
                             'getVariationBaseCategoryList')

product/ERP5/VariationValue.py

@@ -29,9 +29,11 @@
 from Products.ERP5Type import interfaces, Permissions
 from Products.ERP5Type.Context import Context
 from Products.ERP5Type.Base import Base
-from Globals import InitializeClass
+from Products.ERP5Type.Globals import InitializeClass
 from Products.ERP5.Variated import Variated
 
+from zope.interface import implements
+
 def newVariationValue(context=None, REQUEST=None, **kw):
     # Create context object
     context_obj = VariationValue(context=context, REQUEST=REQUEST, **kw)
@@ -47,7 +49,7 @@ class VariationValue(Context, Variated):
   """
 
   # Declarative interfaces
-  __implements__ = (interfaces.IVariated)
+  implements(interfaces.IVariated)
 
   def __init__(self, context=None, REQUEST=None, **kw):
     Context.__init__(self, context=context, REQUEST=REQUEST, **kw)

product/ERP5/__init__.py

@@ -40,7 +40,7 @@ from AccessControl import ModuleSecurityInfo
 import MovementGroup
 allow_class(MovementGroup)
 
-from Globals import package_home
+from Products.ERP5Type.Globals import package_home
 product_path = package_home( globals() )
 
 # Define object classes and tools

product/ERP5/tests/testBusinessTemplate.py

@@ -40,7 +40,7 @@ from Products.ERP5Type.RoleInformation import RoleInformation
 from App.config import getConfiguration
 from Products.ERP5Type.tests.Sequence import SequenceList
 from urllib import pathname2url
-from Globals import PersistentMapping
+from Products.ERP5Type.Globals import PersistentMapping
 from Products.CMFCore.Expression import Expression
 from Products.CMFCore.tests.base.testcase import LogInterceptor
 import shutil